Skip to content

Commit 2c44aee

Browse files
authored
Merge pull request #926 from Quick/xcode13
[CI] Test Xcode 13
2 parents 0fd4ba4 + eb59fa7 commit 2c44aee

File tree

3 files changed

+22
-7
lines changed

3 files changed

+22
-7
lines changed

.github/workflows/ci-swiftpm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: macos-11
1717
strategy:
1818
matrix:
19-
xcode: [12.4, 12.5]
19+
xcode: ["12.4", "12.5", "13.0"]
2020
env:
2121
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
2222
steps:

.github/workflows/ci-xcode.yml

+20-5
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,31 @@ on:
1212

1313
jobs:
1414
xcode:
15-
name: Xcode ${{ matrix.xcode }} - ${{ matrix.platform }}
15+
name: Xcode ${{ matrix.xcode }} (Xcode Project)
1616
runs-on: macos-11
1717
strategy:
1818
matrix:
19-
xcode: [12.4, 12.5]
20-
platform: [macos, ios, tvos]
19+
xcode: ["12.4", "12.5", "13.0"]
2120
fail-fast: false
2221
env:
2322
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
2423
steps:
2524
- uses: actions/checkout@v2
26-
- run: ./test ${{ matrix.platform }}
27-
- run: ./test ${{ matrix.platform }}_xcodespm
25+
- run: ./test macos
26+
- run: ./test ios
27+
- run: ./test tvos
28+
29+
xcode_spm:
30+
name: Xcode ${{ matrix.xcode }} (Swift Package)
31+
runs-on: macos-11
32+
strategy:
33+
matrix:
34+
xcode: ["12.4", "12.5", "13.0"]
35+
fail-fast: false
36+
env:
37+
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
38+
steps:
39+
- uses: actions/checkout@v2
40+
- run: ./test macos_xcodespm
41+
- run: ./test ios_xcodespm
42+
- run: ./test tvos_xcodespm

test

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ function test_macos {
7979
function test_xcode_spm_macos {
8080
mv Nimble.xcodeproj Nimble.xcodeproj.bak
8181
trap 'mv Nimble.xcodeproj.bak Nimble.xcodeproj' EXIT
82-
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
82+
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
8383
}
8484

8585
function test_xcode_spm_ios {

0 commit comments

Comments
 (0)