Merge pull request #926 from Quick/xcode13

[CI] Test Xcode 13
Quick · Aug 28, 2021 · 2c44aee · 2c44aee
2 parents 0fd4ba4 + eb59fa7
commit 2c44aee
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/.github/workflows/ci-swiftpm.yml b/.github/workflows/ci-swiftpm.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: macos-11
     strategy:
       matrix:
-        xcode: [12.4, 12.5]
+        xcode: ["12.4", "12.5", "13.0"]
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
     steps:

diff --git a/.github/workflows/ci-xcode.yml b/.github/workflows/ci-xcode.yml
@@ -12,16 +12,31 @@ on:
 
 jobs:
   xcode:
-    name: Xcode ${{ matrix.xcode }} - ${{ matrix.platform }}
+    name: Xcode ${{ matrix.xcode }} (Xcode Project)
     runs-on: macos-11
     strategy:
       matrix:
-        xcode: [12.4, 12.5]
-        platform: [macos, ios, tvos]
+        xcode: ["12.4", "12.5", "13.0"]
       fail-fast: false
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
     steps:
       - uses: actions/checkout@v2
-      - run: ./test ${{ matrix.platform }}
-      - run: ./test ${{ matrix.platform }}_xcodespm
+      - run: ./test macos
+      - run: ./test ios
+      - run: ./test tvos
+
+  xcode_spm:
+    name: Xcode ${{ matrix.xcode }} (Swift Package)
+    runs-on: macos-11
+    strategy:
+      matrix:
+        xcode: ["12.4", "12.5", "13.0"]
+      fail-fast: false
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
+    steps:
+      - uses: actions/checkout@v2
+      - run: ./test macos_xcodespm
+      - run: ./test ios_xcodespm
+      - run: ./test tvos_xcodespm
diff --git a/test b/test
@@ -79,7 +79,7 @@ function test_macos {
 function test_xcode_spm_macos {
     mv Nimble.xcodeproj Nimble.xcodeproj.bak    
     trap 'mv Nimble.xcodeproj.bak Nimble.xcodeproj' EXIT
-    run set -o pipefail && xcodebuild -scheme "Nimble" -configuration "Debug" -sdk "macosx$BUILD_MACOS_SDK_VERSION" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build-for-testing test-without-building | xcpretty
+    run set -o pipefail && xcodebuild -scheme "Nimble" -configuration "Debug" -sdk "macosx$BUILD_MACOS_SDK_VERSION" -destination "platform=macOS" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build-for-testing test-without-building | xcpretty
 }
 
 function test_xcode_spm_ios {