Skip to content

Commit 1de9b69

Browse files
authored
Merge pull request #98 from unsignedapps/ci/test-updates
Updated CI to support Xcode 13.1 and Xcode 13.2
2 parents c938f8e + 5e594f9 commit 1de9b69

5 files changed

Lines changed: 5 additions & 94 deletions

File tree

.github/workflows/ios-tests.yml

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,6 @@ jobs:
2222
- '.github/workflows/ios-tests.yml'
2323
- '**/*.swift'
2424
25-
#############
26-
# iOS Betas #
27-
#############
28-
29-
# build-ios-beta:
30-
# name: iOS Tests - Xcode Betas
31-
# runs-on: macos-11.0
32-
# if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
33-
# strategy:
34-
# matrix:
35-
# xcode: [ "13.0" ]
36-
37-
# env:
38-
# DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
39-
40-
# steps:
41-
# - name: Checkout
42-
# uses: actions/checkout@v2
43-
# if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
44-
# - name: Build and Test
45-
# run: swift package generate-xcodeproj && xcrun xcodebuild test -scheme "Vexil-Package" -destination "platform=iOS Simulator,name=iPhone 8"
46-
# if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
47-
4825
#####################
4926
# macOS 11 Versions #
5027
#####################
@@ -56,7 +33,7 @@ jobs:
5633
needs: check-changes
5734
strategy:
5835
matrix:
59-
xcode: [ "11.7", "12.4", "12.5.1", "13.0" ]
36+
xcode: [ "11.7", "12.4", "12.5.1", "13.0", "13.1", "13.2" ]
6037

6138
env:
6239
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer

.github/workflows/linux-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
needs: check-changes
3434
strategy:
3535
matrix:
36-
swift: [ "5.2.5", "5.3", "5.3.1", "5.3.2", "5.3.3", "5.4.1", "5.4.2", "5.5.0" ]
36+
swift: [ "5.2.5", "5.3", "5.3.1", "5.3.2", "5.3.3", "5.4.1", "5.4.2", "5.5.0", "5.5.1" ]
3737
os: [ amazonlinux2, bionic, centos7, centos8, focal, xenial ]
3838

3939
container:

.github/workflows/macos-tests.yml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,6 @@ jobs:
2222
- '.github/workflows/macos-tests.yml'
2323
- '**/*.swift'
2424
25-
###############
26-
# macOS Betas #
27-
###############
28-
29-
# build-macos-beta:
30-
# name: macOS Tests - Xcode Betas
31-
# runs-on: macos-11.0
32-
# if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
33-
# needs: check-changes
34-
# strategy:
35-
# matrix:
36-
# xcode: [ "13.0" ]
37-
38-
# env:
39-
# DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
40-
41-
# steps:
42-
# - name: Checkout
43-
# uses: actions/checkout@v2
44-
# - name: Build and Test
45-
# run: swift test
46-
4725
############
4826
# macOS 11 #
4927
############
@@ -55,7 +33,7 @@ jobs:
5533
needs: check-changes
5634
strategy:
5735
matrix:
58-
xcode: [ "11.7", "12.4", "12.5.1", "13.0" ]
36+
xcode: [ "11.7", "12.4", "12.5.1", "13.0", "13.1", "13.2" ]
5937

6038
env:
6139
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer

.github/workflows/tvos-tests.yml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,6 @@ jobs:
2222
- '.github/workflows/tvos-tests.yml'
2323
- '**/*.swift'
2424
25-
##############
26-
# tvOS Betas #
27-
##############
28-
29-
# build-tvos-beta:
30-
# name: tvOS Tests - Xcode Betas
31-
# runs-on: macos-11.0
32-
# if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
33-
# needs: check-changes
34-
# strategy:
35-
# matrix:
36-
# xcode: [ "13.0" ]
37-
38-
# env:
39-
# DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
40-
41-
# steps:
42-
# - name: Checkout
43-
# uses: actions/checkout@v2
44-
# - name: Build and Test
45-
# run: swift package generate-xcodeproj && xcrun xcodebuild test -scheme "Vexil-Package" -destination "platform=tvOS Simulator,name=Apple TV 4K"
46-
4725
#####################
4826
# macOS 11 Versions #
4927
#####################
@@ -55,7 +33,7 @@ jobs:
5533
needs: check-changes
5634
strategy:
5735
matrix:
58-
xcode: [ "11.7", "12.4", "12.5.1", "13.0" ]
36+
xcode: [ "11.7", "12.4", "12.5.1", "13.0", "13.1", "13.2" ]
5937

6038
env:
6139
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer

.github/workflows/watchos-tests.yml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,6 @@ jobs:
2222
- '.github/workflows/watchos-tests.yml'
2323
- '**/*.swift'
2424
25-
#################
26-
# watchOS Betas #
27-
#################
28-
29-
# build-watchos-beta:
30-
# name: watchOS Build - Xcode Betas
31-
# runs-on: macos-11.0
32-
# if: ${{ github.event_name == 'push' || needs.check-changes.outputs.changed == 'true' }}
33-
# needs: check-changes
34-
# strategy:
35-
# matrix:
36-
# xcode: [ "13.0" ]
37-
38-
# env:
39-
# DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
40-
41-
# steps:
42-
# - name: Checkout
43-
# uses: actions/checkout@v2
44-
# - name: Build and Test
45-
# run: swift package generate-xcodeproj && xcrun xcodebuild build -scheme "Vexil-Package" -destination "generic/platform=watchos"
46-
4725
#####################
4826
# macOS 11 Versions #
4927
#####################
@@ -55,7 +33,7 @@ jobs:
5533
needs: check-changes
5634
strategy:
5735
matrix:
58-
xcode: [ "11.7", "12.4", "12.5.1", "13.0" ]
36+
xcode: [ "11.7", "12.4", "12.5.1", "13.0", "13.1", "13.2" ]
5937

6038
env:
6139
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer

0 commit comments

Comments
 (0)