From 5f338cbcf7351bda6517fe67636ea0f8304da8c6 Mon Sep 17 00:00:00 2001 From: Guilherme Souza Date: Mon, 11 Nov 2024 10:10:19 -0300 Subject: [PATCH 1/4] fix ci --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24b143a32..81bc66c1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: matrix: command: [test, ""] platform: [IOS, MAC_CATALYST, MACOS, TVOS, VISIONOS, WATCHOS] - xcode: ["15.4", "16.0"] + xcode: ["15.4", "16"] exclude: - { platform: VISIONOS } include: @@ -67,9 +67,9 @@ jobs: path: | .build key: | - build-spm-linux-${{ matrix.swift-verion }}-${{ hashFiles('**/Sources/**/*.swift', '**/Tests/**/*.swift', '**/Package.resolved') }} + build-spm-linux-${{ matrix.swift-version }}-${{ hashFiles('**/Sources/**/*.swift', '**/Tests/**/*.swift', '**/Package.resolved') }} restore-keys: | - build-spm-linux-${{ matrix.swift-verion }}- + build-spm-linux-${{ matrix.swift-version }}- - run: make dot-env - name: Run tests run: swift test --skip IntegrationTests From 6713bde07f0da3def62f54a609e3d68eb6b47fbc Mon Sep 17 00:00:00 2001 From: Guilherme Souza Date: Mon, 11 Nov 2024 10:22:36 -0300 Subject: [PATCH 2/4] bump macOS to 15 --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/integration-tests.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81bc66c1b..5c575a6b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,12 +16,12 @@ concurrency: jobs: xcodebuild: name: xcodebuild - runs-on: macos-14 + runs-on: macos-15 strategy: matrix: command: [test, ""] platform: [IOS, MAC_CATALYST, MACOS, TVOS, VISIONOS, WATCHOS] - xcode: ["15.4", "16"] + xcode: ["15.4", "16.0"] exclude: - { platform: VISIONOS } include: @@ -86,7 +86,7 @@ jobs: examples: name: Examples - runs-on: macos-14 + runs-on: macos-15 steps: - uses: actions/checkout@v4 - name: Cache derived data @@ -98,7 +98,7 @@ jobs: restore-keys: | deriveddata-examples- - name: Select Xcode 16 - run: sudo xcode-select -s /Applications/Xcode_16.app + run: sudo xcode-select -s /Applications/Xcode_16.0.app - name: Set IgnoreFileSystemDeviceInodeChanges flag run: defaults write com.apple.dt.XCBuild IgnoreFileSystemDeviceInodeChanges -bool YES - name: Update mtime for incremental builds diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 702345564..6ca1cb80f 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -13,14 +13,14 @@ concurrency: jobs: integration-tests: - runs-on: macos-14 + runs-on: macos-15 name: Integration Tests steps: - uses: actions/checkout@v3 with: fetch-depth: 0 - name: Select Xcode 16 - run: sudo xcode-select -s /Applications/Xcode_16.app + run: sudo xcode-select -s /Applications/Xcode_16.0.app - name: Run tests run: make test-integration env: From cdba408661ace5f8464c479784d08affec9b003a Mon Sep 17 00:00:00 2001 From: Guilherme Souza Date: Mon, 11 Nov 2024 10:28:30 -0300 Subject: [PATCH 3/4] add separate step for macos-14 --- .github/workflows/ci.yml | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c575a6b0..8dc49e04d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,24 +21,54 @@ jobs: matrix: command: [test, ""] platform: [IOS, MAC_CATALYST, MACOS, TVOS, VISIONOS, WATCHOS] - xcode: ["15.4", "16.0"] exclude: - { platform: VISIONOS } include: - { command: test, skip_release: 1 } steps: - uses: actions/checkout@v4 - - name: Select Xcode ${{ matrix.xcode }} - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app - name: Cache derived data uses: actions/cache@v3 with: path: | ~/.derivedData key: | - deriveddata-xcodebuild-${{ matrix.platform }}-${{ matrix.xcode }}-${{ matrix.command }}-${{ hashFiles('**/Sources/**/*.swift', '**/Tests/**/*.swift') }} + deriveddata-xcodebuild-${{ matrix.platform }}-${{ matrix.command }}-${{ hashFiles('**/Sources/**/*.swift', '**/Tests/**/*.swift') }} restore-keys: | - deriveddata-xcodebuild-${{ matrix.platform }}-${{ matrix.xcode }}-${{ matrix.command }}- + deriveddata-xcodebuild-${{ matrix.platform }}-${{ matrix.command }}- + - name: Set IgnoreFileSystemDeviceInodeChanges flag + run: defaults write com.apple.dt.XCBuild IgnoreFileSystemDeviceInodeChanges -bool YES + - name: Update mtime for incremental builds + uses: chetan/git-restore-mtime-action@v2 + - run: make dot-env + - name: Debug + run: make XCODEBUILD_ARGUMENT="${{ matrix.command }}" CONFIG=Debug PLATFORM="${{ matrix.platform }}" xcodebuild + - name: Release + if: matrix.skip_release != '1' + run: make XCODEBUILD_ARGUMENT="${{ matrix.command }}" CONFIG=Release PLATFORM="${{ matrix.platform }}" xcodebuild + + xcodebuild-macOS-14: + name: xcodebuild + runs-on: macos-14 + strategy: + matrix: + command: [test, ""] + platform: [IOS, MAC_CATALYST, MACOS, TVOS, VISIONOS, WATCHOS] + exclude: + - { platform: VISIONOS } + include: + - { command: test, skip_release: 1 } + steps: + - uses: actions/checkout@v4 + - name: Cache derived data + uses: actions/cache@v3 + with: + path: | + ~/.derivedData + key: | + deriveddata-xcodebuild-${{ matrix.platform }}-${{ matrix.command }}-${{ hashFiles('**/Sources/**/*.swift', '**/Tests/**/*.swift') }} + restore-keys: | + deriveddata-xcodebuild-${{ matrix.platform }}-${{ matrix.command }}- - name: Set IgnoreFileSystemDeviceInodeChanges flag run: defaults write com.apple.dt.XCBuild IgnoreFileSystemDeviceInodeChanges -bool YES - name: Update mtime for incremental builds From a1085c57fd6334bb782b7d43b2a09dc88fe76843 Mon Sep 17 00:00:00 2001 From: Guilherme Souza Date: Mon, 11 Nov 2024 10:30:05 -0300 Subject: [PATCH 4/4] remove custom name --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8dc49e04d..2c99cadb4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,6 @@ concurrency: jobs: xcodebuild: - name: xcodebuild runs-on: macos-15 strategy: matrix: @@ -48,7 +47,6 @@ jobs: run: make XCODEBUILD_ARGUMENT="${{ matrix.command }}" CONFIG=Release PLATFORM="${{ matrix.platform }}" xcodebuild xcodebuild-macOS-14: - name: xcodebuild runs-on: macos-14 strategy: matrix: