Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,16 @@ jobs:
strategy:
fail-fast: false
matrix:
ios: [^26, ^18, ^17]
include:
- macos: macos-15
ios: ^18
- ios: ^26
xcode: ^26
- ios: ^18
xcode: ^16
- ios: ^17
xcode: ^16
# - macos: macos-15
# ios: ^26
# xcode: ^26
# Note: iOS 26 simulator is not yet available on GitHub runners
uses: ./.github/workflows/reusable-workflow.yaml
with:
ios: ${{ matrix.ios }}
xcode: ${{ matrix.xcode }}
macos: ${{ matrix.macos }}
secrets: inherit
17 changes: 7 additions & 10 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
permission-check:
runs-on: macos-15
runs-on: macos-26
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/.github/DangerFiles/Gemfile
steps:
Expand All @@ -33,18 +33,15 @@ jobs:
needs: [permission-check]
strategy:
matrix:
ios: [^26, ^18]
include:
- macos: macos-15
ios: ^18
- ios: ^26
xcode: ^26
- ios: ^18
xcode: ^16
# - macos: macos-15
# ios: ^26
# xcode: ^26
# Note: iOS 26 simulator is not yet available on GitHub runners
uses: ./.github/workflows/reusable-workflow.yaml
with:
is_pr: true
macos: ${{ matrix.macos }}
ios: ${{ matrix.ios }}
xcode: ${{ matrix.xcode }}
ios: ${{ matrix.include.ios }}
xcode: ${{ matrix.include.xcode }}
secrets: inherit
7 changes: 5 additions & 2 deletions .github/workflows/reusable-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
required: false
type: string
macos:
default: macos-15
default: macos-26
required: false
type: string
is_pr:
Expand Down Expand Up @@ -38,6 +38,9 @@ jobs:
cd iosTests
./prepareios.js
./create_test_credentials_from_env.js
- name: Install iOS 17 runtime if needed
if: ${{ inputs.ios == '^17' }}
run: xcodes runtimes install "iOS 17.5"
- uses: mxcl/xcodebuild@v3
with:
xcode: ${{ inputs.xcode }}
Expand All @@ -54,7 +57,7 @@ jobs:
show-code-coverage: false
upload-bundles: false
show-passed-tests: false
if: success() || failure()
if: success() || failure() && ${{ inputs.ios != '^26' }}
- uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
Expand Down
Loading