Skip to content

Commit 3fbefa2

Browse files
committed
move rc test to spm
1 parent 1df0e6e commit 3fbefa2

File tree

3 files changed

+21
-23
lines changed

3 files changed

+21
-23
lines changed

.github/workflows/analytics.yml

+10-11
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,13 @@ jobs:
3232
runs-on: macOS-15
3333
strategy:
3434
matrix:
35-
os: [iOS, catalyst, tvOS, macOS]
35+
os: [iOS, tvOS, macOS]
3636
xcode: ["16.1"]
3737
include:
3838
- os: iOS
3939
device: iPhone 16
40+
scheme: AnalyticsExample
4041
test: true
41-
- os: catalyst
42-
device: localhost
43-
test: false # disabled due to a permissions error on launch (OSStatus -54).
4442
- os: tvOS
4543
device: Apple TV 4K (3rd generation) (at 1080p)
4644
scheme: AnalyticsExampleTV
@@ -50,21 +48,22 @@ jobs:
5048
scheme: AnalyticsExampleMac
5149
test: true
5250
env:
51+
OS: ${{ matrix.os }}
52+
SETUP: analytics
5353
SPM: true
5454
LEGACY: false
55-
OS: ${{ matrix.os }}
55+
DIR: analytics
5656
DEVICE: ${{ matrix.device }}
57+
TEST: ${{ matrix.test }}
5758
SCHEME: ${{ matrix.scheme }}
5859
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
5960
steps:
6061
- name: Checkout
6162
uses: actions/checkout@master
6263
- name: Setup
6364
run: |
64-
cd analytics
65-
../scripts/install_prereqs/analytics.sh
66-
- name: Build Swift
65+
gem install xcpretty
66+
cd $SETUP
67+
../scripts/install_prereqs/${SETUP}.sh
68+
- name: Build and Test SwiftUI (${{ matrix.os }})
6769
run: ./scripts/test.sh
68-
env:
69-
TEST: ${{ matrix.test }}
70-
SWIFT_SUFFIX: ""

.github/workflows/authentication.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,22 @@ jobs:
3131
name: spm
3232
runs-on: macOS-15
3333
env:
34+
OS: iOS
35+
SETUP: authentication
3436
SPM: true
3537
LEGACY: false
36-
OS: iOS
38+
DIR: authentication
3739
DEVICE: iPhone 16
3840
TEST: true
41+
SCHEME: AuthenticationExample
42+
DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer
3943
steps:
4044
- name: Checkout
4145
uses: actions/checkout@master
4246
- name: Setup
4347
run: |
44-
cd authentication
45-
../scripts/install_prereqs/authentication.sh
46-
- name: Build Swift
48+
gem install xcpretty
49+
cd $SETUP
50+
../scripts/install_prereqs/${SETUP}.sh
51+
- name: Build and Test SwiftUI (${OS})
4752
run: ./scripts/test.sh
48-
env:
49-
SWIFT_SUFFIX: ""

.github/workflows/config.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ env:
2828

2929
jobs:
3030
cocoapods:
31-
name: cocoapods
31+
name: spm
3232
runs-on: macOS-15
3333
env:
34-
SPM: false
34+
SPM: true
3535
LEGACY: false
3636
SWIFT_SUFFIX: ""
3737
TEST: true
@@ -41,10 +41,6 @@ jobs:
4141
- name: Setup
4242
run: |
4343
cd config
44-
gem install bundler
45-
bundle install
46-
gem install xcpretty
47-
bundle exec pod install --repo-update
4844
../scripts/install_prereqs/config.sh
4945
xcrun simctl boot "iPhone 16"
5046
- name: Build Swift

0 commit comments

Comments
 (0)