Skip to content

Commit cc17d6c

Browse files
committed
Test using SPM on CI
Added an SPM job to the CI configuration. Updated Xcode and simulator versions. Use the Carthage workaround with Xcode 12.
1 parent 996e103 commit cc17d6c

File tree

1 file changed

+27
-18
lines changed

1 file changed

+27
-18
lines changed

.circleci/config.yml

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,26 @@ step-library:
2727
command: bash <(curl -s https://codecov.io/bash)
2828

2929
jobs:
30+
SPM-job:
31+
parameters:
32+
xcode:
33+
type: string
34+
macos:
35+
xcode: << parameters.xcode >>
36+
environment:
37+
HOMEBREW_NO_AUTO_UPDATE: 1
38+
steps:
39+
- checkout
40+
- run: swift build
41+
- run: swift test
42+
3043
build-job:
3144
parameters:
3245
xcode:
3346
type: string
3447
device:
3548
type: string
36-
default: "iPhone 6 Plus"
49+
default: "iPhone 8 Plus"
3750
iOS:
3851
type: string
3952
default: "12.1"
@@ -64,10 +77,10 @@ jobs:
6477
- run:
6578
name: Dependencies
6679
command: |
67-
carthage bootstrap --platform ios --cache-builds --configuration Debug --no-use-binaries
68-
carthage bootstrap --platform tvos --cache-builds --configuration Debug --no-use-binaries
69-
carthage bootstrap --platform macos --cache-builds --configuration Debug --no-use-binaries
70-
carthage bootstrap --platform watchos --cache-builds --configuration Debug --no-use-binaries
80+
./scripts/wcarthage.sh bootstrap --platform ios --cache-builds --configuration Debug --no-use-binaries
81+
./scripts/wcarthage.sh bootstrap --platform tvos --cache-builds --configuration Debug --no-use-binaries
82+
./scripts/wcarthage.sh bootstrap --platform macos --cache-builds --configuration Debug --no-use-binaries
83+
./scripts/wcarthage.sh bootstrap --platform watchos --cache-builds --configuration Debug --no-use-binaries
7184
- *save-cache
7285
- run:
7386
name: iOS
@@ -88,22 +101,18 @@ jobs:
88101
command: xcodebuild -project MapboxGeocoder.xcodeproj -scheme 'MapboxGeocoder Mac' clean build<<# parameters.test >> test <</ parameters.test >><<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >>
89102
- run:
90103
name: watchOS
91-
command: xcodebuild -project MapboxGeocoder.xcodeproj -scheme 'MapboxGeocoder watchOS' -destination 'platform=watchOS Simulator,name=Apple Watch Series 4 - 44mm,OS=<< parameters.watchOS >>' clean build
104+
command: xcodebuild -project MapboxGeocoder.xcodeproj -scheme 'MapboxGeocoder watchOS' -destination 'platform=watchOS Simulator,name=Apple Watch Series 5 - 44mm,OS=<< parameters.watchOS >>' clean build
92105

93106
workflows:
94107
workflow:
95108
jobs:
96109
- build-job:
97-
name: "Xcode_10.2_iOS_12"
98-
xcode: "10.2.0"
99-
iOS: "12.2"
100-
tvOS: "12.2"
101-
watchOS: "5.2"
110+
name: "Xcode_12.0"
111+
xcode: "12.0.0"
112+
iOS: "14.0"
113+
tvOS: "14.0"
114+
watchOS: "7.0"
102115
codecoverage: true
103-
- build-job:
104-
name: "Xcode_11.3_iOS_13"
105-
xcode: "11.3.0"
106-
device: "iPhone 8 Plus"
107-
iOS: "13.3"
108-
tvOS: "13.3"
109-
watchOS: "6.1.1"
116+
- SPM-job:
117+
name: "SPM"
118+
xcode: "12.2.0"

0 commit comments

Comments
 (0)