From bcee9db3deea4ce1667f3c13d75856f6bd2e9478 Mon Sep 17 00:00:00 2001 From: Christian Treffs Date: Sun, 17 Nov 2024 12:37:25 +0100 Subject: [PATCH] Maintenance (#83) * Update JamesIves/github-pages-deploy-action action to v4.6.9 * Update codecov/codecov-action action to v5 * Update dependency nicklockwood/SwiftFormat to v0.55.0 * Migrate codecov * Update macOS matrix * Update macOS job strategy matrix * Rename jobs --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/ci-linux.yml | 2 +- .github/workflows/ci-macos.yml | 28 +++++++++++++++------------- .github/workflows/ci-wasm.yml | 2 +- .github/workflows/ci-windows.yml | 2 +- .github/workflows/documentation.yml | 4 ++-- Mintfile | 2 +- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 38fad3a4..c075aeae 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -7,7 +7,7 @@ on: branches: [ master ] jobs: - linux-test-build-release: + linux: runs-on: ubuntu-latest strategy: matrix: diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 58641bbe..c4b66f2c 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -9,32 +9,34 @@ on: env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - CODECOV_XCODE_VERSION: "15.4" # Xcode version used to generate code coverage + CODECOV_XCODE_VERSION: "16.0" # Xcode version used to generate code coverage jobs: - macos-test-build-release-xcode: - runs-on: macOS-latest + macos: + runs-on: ${{ matrix.config.os }} strategy: + fail-fast: true matrix: - xcode: ["14.3.1", "15.4", "16.0"] - + config: + - { os: "macos-14", xcode: "15.4" } + - { os: "macos-15", xcode: "16.0" } steps: - name: Checkout uses: actions/checkout@v4 - - name: Select Xcode ${{ matrix.xcode }} - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app + - name: Select Xcode ${{ matrix.config.xcode }} + run: sudo xcode-select -s /Applications/Xcode_${{ matrix.config.xcode }}.app - name: Test run: swift test -c release --parallel --xunit-output .build/xUnit-output.xml --enable-code-coverage env: - DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_${{ matrix.config.xcode }}.app/Contents/Developer - name: Upload test artifacts if: failure() uses: actions/upload-artifact@v4.4.3 with: - name: test-artifacts-${{ matrix.xcode }}-${{ github.run_id }} + name: test-artifacts-${{ matrix.config.xcode }}-${{ github.run_id }} path: | .build/*.yaml .build/*.xml @@ -48,13 +50,13 @@ jobs: # Only run coverage steps if the CODECOV_TOKEN is available and the matrix.xcode matches CODECOV_XCODE_VERSION - name: Generate coverage report - if: env.CODECOV_TOKEN != '' && matrix.xcode == env.CODECOV_XCODE_VERSION + if: env.CODECOV_TOKEN != '' && matrix.config.xcode == env.CODECOV_XCODE_VERSION run: xcrun llvm-cov export -format="lcov" .build/**/*PackageTests.xctest/Contents/MacOS/*PackageTests -instr-profile .build/**/codecov/default.profdata > coverage.lcov - name: Upload code coverage report - if: env.CODECOV_TOKEN != '' && matrix.xcode == env.CODECOV_XCODE_VERSION - uses: codecov/codecov-action@v4.6.0 + if: env.CODECOV_TOKEN != '' && matrix.config.xcode == env.CODECOV_XCODE_VERSION + uses: codecov/codecov-action@v5.0.2 with: token: ${{ env.CODECOV_TOKEN }} - file: coverage.lcov + files: coverage.lcov fail_ci_if_error: true diff --git a/.github/workflows/ci-wasm.yml b/.github/workflows/ci-wasm.yml index 0af195b2..cef73ced 100644 --- a/.github/workflows/ci-wasm.yml +++ b/.github/workflows/ci-wasm.yml @@ -7,7 +7,7 @@ on: branches: [ master ] jobs: - wasm-build: + wasm: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index ab95135f..411e4750 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -7,7 +7,7 @@ on: branches: [ master ] jobs: - windows-test-build-release: + windows: runs-on: windows-latest steps: - name: Setup diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 27d84dda..952d338a 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -16,7 +16,7 @@ concurrency: cancel-in-progress: true jobs: - build: + documentation: runs-on: macos-14 steps: - name: Select Xcode 16.0 @@ -69,7 +69,7 @@ jobs: run: 'sudo chown -R $USER docs' - name: Publish documentation to GitHub Pages - uses: JamesIves/github-pages-deploy-action@v4.6.8 + uses: JamesIves/github-pages-deploy-action@v4.6.9 with: branch: gh-pages folder: docs diff --git a/Mintfile b/Mintfile index cf6a9886..fda212be 100644 --- a/Mintfile +++ b/Mintfile @@ -1,3 +1,3 @@ realm/SwiftLint@0.57.0 -nicklockwood/SwiftFormat@0.54.6 +nicklockwood/SwiftFormat@0.55.0 krzysztofzablocki/Sourcery@2.2.5