Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Infra] Fix missing Xcode 15 runs in functions and storage workflows #14065

Merged
merged 1 commit into from
Nov 8, 2024
Merged

[Infra] Fix missing Xcode 15 runs in functions and storage workflows #14065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .github/workflows/functions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ jobs:
strategy:
matrix:
target: [ios, tvos, macos, watchos]
include:
build-env:
- os: macos-14
xcode: Xcode_15.2
- os: macos-15
xcode: Xcode_16.1
runs-on: ${{ matrix.os }}
runs-on: ${{ matrix.build-env.os }}
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
- name: Xcode
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
- name: Setup Bundler
run: scripts/setup_bundler.sh
# The integration tests are flaky on Xcode 15 so only run the unit tests. The integration tests still run with SPM.
Expand Down
16 changes: 7 additions & 9 deletions .github/workflows/storage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,15 +195,14 @@ jobs:
strategy:
matrix:
target: [ios, tvos, macos, watchos]
os: [macos-14]
include:
build-env:
- os: macos-14
xcode: Xcode_15.3
tests: --skip-tests
- os: macos-15
xcode: Xcode_16.1
tests: --test-specs=unit
runs-on: ${{ matrix.os }}
runs-on: ${{ matrix.build-env.os }}
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
Expand All @@ -212,10 +211,10 @@ jobs:
- name: Xcodes
run: ls -l /Applications/Xcode*
- name: Xcode
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
- name: Build and test
run: |
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseStorage.podspec ${{ matrix.tests }} \
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseStorage.podspec ${{ matrix.build-env.tests }} \
--platforms=${{ matrix.target }}

storage-cron-only:
Expand All @@ -224,20 +223,19 @@ jobs:
strategy:
matrix:
target: [ios, tvos, macos, watchos]
os: [macos-14, macos-15]
include:
build-env:
- os: macos-14
xcode: Xcode_15.3
- os: macos-15
xcode: Xcode_16.1
runs-on: ${{ matrix.os }}
runs-on: ${{ matrix.build-env.os }}
needs: pod-lib-lint
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
- name: Setup Bundler
run: scripts/setup_bundler.sh
- name: Xcode
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
- name: PodLibLint Storage Cron
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseStorage.podspec --platforms=${{ matrix.target }} --use-static-frameworks --skip-tests
Loading