Skip to content

Commit 8b82907

Browse files
committed
*release workflow updates
1 parent c141e3a commit 8b82907

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

.github/workflows/prerelease.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,7 @@ jobs:
254254

255255
quickstart:
256256
# Don't run on private repo unless it is a PR.
257-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'workflow_dispatch'
258-
needs: buildup_SpecsTesting_repo
257+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
259258
strategy:
260259
matrix:
261260
include:
@@ -289,16 +288,13 @@ jobs:
289288
- name: Xcode
290289
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
291290
- name: Setup testing repo and quickstart
292-
run: BOT_TOKEN="${botaccess}" scripts/setup_quickstart.sh ${{ matrix.product }} prerelease_testing
291+
run: BOT_TOKEN="${botaccess}" scripts/setup_quickstart_spm.sh ${{ matrix.product }} prerelease_testing
293292
- name: Install Secret GoogleService-Info.plist
294293
run: |
295294
scripts/decrypt_gha_secret.sh \
296295
scripts/gha-encrypted/qs-${{ matrix.product }}.plist.gpg \
297296
quickstart-ios/${{ matrix.product }}/GoogleService-Info.plist \
298297
"$plist_secret"
299-
- name: Run setup command, if needed.
300-
if: matrix.setup_command != ''
301-
run: ${{ matrix.setup_command }}
302298
- name: Build Quickstart
303299
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
304300
with:

.github/workflows/release.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,11 @@ jobs:
153153
if: ${{ always() }}
154154
run: pod repo remove "${local_repo}"
155155

156+
# TODO(ncooke3): Probably should separate *release workflows into
157+
# *release-cocoapods and *release (spm).
156158
quickstart:
157159
# Don't run on private repo unless it is a PR.
158-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'workflow_dispatch'
159-
needs: buildup_SpecsReleasing_repo
160+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
160161
strategy:
161162
matrix:
162163
include:
@@ -190,14 +191,11 @@ jobs:
190191
run: sudo xcode-select -s /Applications/Xcode_16.4.app
191192
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
192193
- name: Setup testing repo and quickstart
193-
run: BOT_TOKEN="${botaccess}" scripts/setup_quickstart.sh ${{ matrix.product }} nightly_release_testing
194+
run: BOT_TOKEN="${botaccess}" scripts/setup_quickstart_spm.sh ${{ matrix.product }} nightly_release_testing
194195
- name: Install Secret GoogleService-Info.plist
195196
run: |
196197
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-${{ matrix.product }}.plist.gpg \
197198
quickstart-ios/${{ matrix.product }}/GoogleService-Info.plist "$plist_secret"
198-
- name: Run setup command, if needed.
199-
if: matrix.setup_command != ''
200-
run: ${{ matrix.setup_command }}
201199
- name: Build Quickstart
202200
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
203201
with:

0 commit comments

Comments
 (0)