Skip to content

Commit aebc24e

Browse files
committed
Merge remote-tracking branch 'origin/main' into ah/ai-generable-macro
2 parents 52b4e17 + bf942b9 commit aebc24e

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

.github/workflows/common.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
xcode: Xcode_16.2
9797
platform: iOS
9898
- os: macos-26
99-
xcode: Xcode_26.0
99+
xcode: Xcode_26.1
100100
platform: iOS
101101
runs-on: ${{ matrix.os }}
102102
steps:

.github/workflows/crashlytics.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,17 @@ jobs:
6363
steps:
6464
- uses: actions/checkout@v4
6565
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
66+
- name: Setup Bundler
67+
run: scripts/setup_bundler.sh
68+
- name: Install xcpretty
69+
run: gem install xcpretty
6670
- uses: actions/setup-python@v5
6771
with:
6872
python-version: '3.11'
6973
- name: Xcode
7074
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
7175
- name: Setup quickstart
72-
run: scripts/setup_quickstart.sh crashlytics
76+
run: scripts/setup_quickstart_spm.sh crashlytics
7377
- name: Install Secret GoogleService-Info.plist
7478
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-crashlytics.plist.gpg \
7579
quickstart-ios/crashlytics/GoogleService-Info.plist "$plist_secret"

.github/workflows/firebaseai.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
xcode: Xcode_16.4
4747
- os: macos-26
4848
target: iOS
49-
xcode: Xcode_26.0
49+
xcode: Xcode_26.1
5050
runs-on: ${{ matrix.os }}
5151
needs: spm
5252
env:
@@ -88,7 +88,7 @@ jobs:
8888
- os: macos-15
8989
xcode: Xcode_16.4
9090
- os: macos-26
91-
xcode: Xcode_26.0
91+
xcode: Xcode_26.1
9292
runs-on: ${{ matrix.os }}
9393
env:
9494
BRANCH_NAME: ${{ github.head_ref || github.ref_name || 'main' }}

0 commit comments

Comments
 (0)