From b911a6436057d7a13cd67a63353bdf683434ac0a Mon Sep 17 00:00:00 2001
From: Sho Ikeda <suicaicoca@gmail.com>
Date: Sat, 28 Aug 2021 16:31:54 +0900
Subject: [PATCH 1/2] [CI] Test Xcode 13

---
 .github/workflows/ci-swiftpm.yml | 2 +-
 .github/workflows/ci-xcode.yml   | 2 +-
 test                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-swiftpm.yml b/.github/workflows/ci-swiftpm.yml
index 682b7eb17..3b869ff47 100644
--- 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
index c3507eb14..e4928d0be 100644
--- a/.github/workflows/ci-xcode.yml
+++ b/.github/workflows/ci-xcode.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: macos-11
     strategy:
       matrix:
-        xcode: [12.4, 12.5]
+        xcode: ["12.4", "12.5", "13.0"]
         platform: [macos, ios, tvos]
       fail-fast: false
     env:
diff --git a/test b/test
index 7e5eec38a..183866238 100755
--- 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 {

From eb59fa74ebcb610ec7aad5a82b7f91ee45fc956b Mon Sep 17 00:00:00 2001
From: Sho Ikeda <suicaicoca@gmail.com>
Date: Sat, 28 Aug 2021 16:48:07 +0900
Subject: [PATCH 2/2] WIP

---
 .github/workflows/ci-xcode.yml | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-xcode.yml b/.github/workflows/ci-xcode.yml
index e4928d0be..3458b8a93 100644
--- 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", "13.0"]
-        platform: [macos, ios, tvos]
       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