Skip to content

Commit

Permalink
Run CI on macOS 15 with the iPhone 16 simulator
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewheard committed Nov 8, 2024
1 parent d322e34 commit c57aeac
Show file tree
Hide file tree
Showing 18 changed files with 45 additions and 45 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/abtesting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ env:
jobs:
cocoapods:
name: cocoapods
runs-on: macOS-14
runs-on: macOS-15
env:
SPM: false
TEST: true
Expand All @@ -55,17 +55,17 @@ jobs:
LEGACY: true
SWIFT_SUFFIX: ""
OS: iOS
DEVICE: iPhone 14
DEVICE: iPhone 16
spm:
name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }})
runs-on: macOS-14
runs-on: macOS-15
strategy:
matrix:
xcode: ["15.3"]
os: [iOS, tvOS, macOS, watchOS, catalyst]
include:
- os: iOS
device: iPhone 15
device: iPhone 16
# Test runs locally but fails in CI with:
# (Underlying Error: lstat of
# /Users/runner/Library/Developer/CoreSimulator/Devices/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/admob.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ env:
jobs:
cocoapods:
name: cocoapods
runs-on: macOS-14
runs-on: macOS-15
env:
SPM: false
LEGACY: false
OS: iOS
DEVICE: iPhone 14
DEVICE: iPhone 16
TEST: false
steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/analytics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ env:
jobs:
cocoapods:
name: cocoapods - ${{ matrix.os }}
runs-on: macOS-14
runs-on: macOS-15
strategy:
matrix:
os: [iOS, catalyst, tvOS, macOS]
xcode: ["15.3"]
include:
- os: iOS
device: iPhone 14
device: iPhone 16
- os: catalyst
device: localhost
- os: tvOS
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/authentication.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ env:
jobs:
cocoapods:
name: cocoapods
runs-on: macOS-14
runs-on: macOS-15
env:
SPM: false
LEGACY: false
OS: iOS
DEVICE: iPhone 14
DEVICE: iPhone 16
TEST: false
steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ concurrency:

jobs:
check:
runs-on: macOS-14
runs-on: macOS-15
env:
MINT_PATH: ${{ github.workspace }}/mint
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ env:
jobs:
cocoapods:
name: cocoapods
runs-on: macOS-14
runs-on: macOS-15
env:
SPM: false
LEGACY: false
Expand All @@ -46,9 +46,9 @@ jobs:
gem install xcpretty
bundle exec pod install --repo-update
../scripts/install_prereqs/config.sh
xcrun simctl boot "iPhone 14"
xcrun simctl boot "iPhone 16"
- name: Build Swift
run: ./scripts/test.sh
env:
OS: iOS
DEVICE: iPhone 14
DEVICE: iPhone 16
8 changes: 4 additions & 4 deletions .github/workflows/crashlytics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ env:
jobs:
cocoapods:
name: cocoapods
runs-on: macOS-14
runs-on: macOS-15
env:
SPM: false
LEGACY: true
OS: iOS
DEVICE: iPhone 14
DEVICE: iPhone 16
TEST: true
steps:
- name: Checkout
Expand All @@ -54,14 +54,14 @@ jobs:
SWIFT_SUFFIX: Swift
spm:
name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }})
runs-on: macOS-14
runs-on: macOS-15
strategy:
matrix:
xcode: ["15.3"]
os: [iOS, tvOS, macOS, watchOS]
include:
- os: iOS
device: iPhone 14
device: iPhone 16
test: false # flaky
- os: tvOS
device: Apple TV 4K (3rd generation) (at 1080p)
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ env:
jobs:
cocoapods:
name: cocoapods
runs-on: macOS-14
runs-on: macOS-15
env:
SPM: false
LEGACY: false
OS: iOS
DEVICE: iPhone 14
DEVICE: iPhone 16
TEST: false
steps:
- name: Checkout
Expand All @@ -53,14 +53,14 @@ jobs:
SWIFT_SUFFIX: Swift
spm:
name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }})
runs-on: macOS-14
runs-on: macOS-15
strategy:
matrix:
xcode: ["15.3"]
os: [iOS, tvOS, macOS]
include:
- os: iOS
device: iPhone 14
device: iPhone 16
test: false
- os: tvOS
device: Apple TV 4K (3rd generation) (at 1080p)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dynamiclinks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ env:
jobs:
cocoapods:
name: cocoapods
runs-on: macOS-14
runs-on: macOS-15
env:
SPM: false
LEGACY: false
OS: iOS
DEVICE: iPhone 14
DEVICE: iPhone 16
TEST: true
steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/firestore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ env:
jobs:
cocoapods:
name: cocoapods
runs-on: macOS-14
runs-on: macOS-15
env:
SPM: false
LEGACY: false
OS: iOS
DEVICE: iPhone 14
DEVICE: iPhone 16
TEST: false
steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ env:
jobs:
spm:
name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }})
runs-on: macOS-14
runs-on: macOS-15
strategy:
matrix:
xcode: ["15.3"]
os: [iOS, tvOS, macOS]
include:
- os: iOS
device: iPhone 14
device: iPhone 16
- os: tvOS
device: Apple TV 4K (3rd generation) (at 1080p)
- os: macOS
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/inappmessaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ env:
jobs:
cocoapods:
name: cocoapods
runs-on: macOS-14
runs-on: macOS-15
env:
SPM: false
LEGACY: false
OS: iOS
DEVICE: iPhone 14
DEVICE: iPhone 16
TEST: true
steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/installations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ env:
jobs:
cocoapods:
name: cocoapods
runs-on: macOS-14
runs-on: macOS-15
env:
SPM: false
LEGACY: false
OS: iOS
DEVICE: iPhone 14
DEVICE: iPhone 16
TEST: true
steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/messaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ env:
jobs:
cocoapods:
name: cocoapods
runs-on: macOS-14
runs-on: macOS-15
env:
SPM: false
LEGACY: false
OS: iOS
DEVICE: iPhone 14
DEVICE: iPhone 16
TEST: false
steps:
- name: Checkout
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ env:
jobs:
cocoapods:
name: cocoapods
runs-on: macOS-14
runs-on: macOS-15
env:
SPM: false
LEGACY: false
OS: iOS
DEVICE: iPhone 14
DEVICE: iPhone 16
TEST: true
steps:
- name: Checkout
Expand All @@ -57,14 +57,14 @@ jobs:
SWIFT_SUFFIX: Swift
spm:
name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }})
runs-on: macOS-14
runs-on: macOS-15
strategy:
matrix:
xcode: ["15.3"]
os: [iOS, tvOS]
include:
- os: iOS
device: iPhone 14
device: iPhone 16
test: false
- os: tvOS
device: Apple TV 4K (3rd generation) (at 1080p)
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ env:
jobs:
cocoapods:
name: cocoapods
runs-on: macOS-14
runs-on: macOS-15
env:
SPM: false
LEGACY: true
OS: iOS
DEVICE: iPhone 14
DEVICE: iPhone 16
TEST: true
steps:
- name: Checkout
Expand All @@ -55,14 +55,14 @@ jobs:

spm:
name: spm (Xcode ${{ matrix.xcode }} - ${{ matrix.os }})
runs-on: macOS-14
runs-on: macOS-15
strategy:
matrix:
xcode: ["15.3"]
os: [iOS, tvOS, macOS]
include:
- os: iOS
device: iPhone 14
device: iPhone 16
- os: tvOS
device: Apple TV 4K (3rd generation) (at 1080p)
- os: macOS
Expand Down
4 changes: 2 additions & 2 deletions scripts/framework_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ if [[ "$have_secrets" == true ]]; then
xcodebuild \
-project ${SAMPLE}Example.xcodeproj \
-scheme ${SAMPLE}Example${SWIFT_SUFFIX} \
-destination 'platform=iOS Simulator,name=iPhone 14 Pro' "OTHER_LDFLAGS=\$(OTHER_LDFLAGS) -ObjC" "FRAMEWORK_SEARCH_PATHS= \$(PROJECT_DIR)/Firebase/" HEADER_SEARCH_PATHS='$(PROJECT_DIR)/Firebase' \
-destination 'platform=iOS Simulator,name=iPhone 16 Pro' "OTHER_LDFLAGS=\$(OTHER_LDFLAGS) -ObjC" "FRAMEWORK_SEARCH_PATHS= \$(PROJECT_DIR)/Firebase/" HEADER_SEARCH_PATHS='$(PROJECT_DIR)/Firebase' \
build \
test \
) || EXIT_STATUS=$?
Expand All @@ -48,7 +48,7 @@ else
xcodebuild \
-project ${SAMPLE}Example.xcodeproj \
-scheme ${SAMPLE}Example${SWIFT_SUFFIX} \
-destination 'platform=iOS Simulator,name=iPhone 14 Pro' "OTHER_LDFLAGS=\$(OTHER_LDFLAGS) -ObjC" "FRAMEWORK_SEARCH_PATHS= \$(PROJECT_DIR)/Firebase/" HEADER_SEARCH_PATHS='$(PROJECT_DIR)/Firebase' \
-destination 'platform=iOS Simulator,name=iPhone 16 Pro' "OTHER_LDFLAGS=\$(OTHER_LDFLAGS) -ObjC" "FRAMEWORK_SEARCH_PATHS= \$(PROJECT_DIR)/Firebase/" HEADER_SEARCH_PATHS='$(PROJECT_DIR)/Firebase' \
build
) || EXIT_STATUS=$?
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [[ -z "${SPM:-}" ]]; then
fi
if [[ -z "${OS:-}" ]]; then
OS=iOS
DEVICE="iPhone 14"
DEVICE="iPhone 16"
echo "Defaulting to OS=$OS"
echo "Defaulting to DEVICE=$DEVICE"
fi
Expand Down

0 comments on commit c57aeac

Please sign in to comment.