Merge branch 'main' into dependabot/swift/github.com/apple/swift-cryp…

…to-3.9.1
supabase · Nov 11, 2024 · 8f5cc51 · 8f5cc51
2 parents a8b640e + f714efd
commit 8f5cc51
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,30 +15,58 @@ concurrency:
 
 jobs:
   xcodebuild:
-    name: xcodebuild
+    runs-on: macos-15
+    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
+        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:
     runs-on: macos-14
     strategy:
       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
@@ -67,9 +95,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
@@ -86,7 +114,7 @@ jobs:
 
   examples:
     name: Examples
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - uses: actions/checkout@v4
       - name: Cache derived data
@@ -98,7 +126,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
@@ -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: