Skip to content

Commit 0bb0dcf

Browse files
paulb777paulb777
authored
Migrate a few more retry steps (#12371)
1 parent d95c62b commit 0bb0dcf

File tree

3 files changed

+77
-30
lines changed

3 files changed

+77
-30
lines changed

‎.github/workflows/abtesting.yml

+21-8
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,13 @@ jobs:
3838
run: scripts/setup_bundler.sh
3939
- name: Xcode
4040
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
41-
- name: Build and test
42-
run: |
43-
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseABTesting.podspec \
44-
--platforms=${{ matrix.target }}
41+
- uses: nick-fields/retry@v3
42+
with:
43+
timeout_minutes: 120
44+
max_attempts: 3
45+
retry_on: error
46+
retry_wait_seconds: 120
47+
command: scripts/pod_lib_lint.rb FirebaseABTesting.podspec --platforms=${{ matrix.target }}
4548

4649
spm:
4750
# Don't run on private repo unless it is a PR.
@@ -65,8 +68,13 @@ jobs:
6568
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
6669
- name: Initialize xcodebuild
6770
run: scripts/setup_spm_tests.sh
68-
- name: Unit Tests
69-
run: scripts/third_party/travis/retry.sh ./scripts/build.sh ABTestingUnit ${{ matrix.target }} spm
71+
- uses: nick-fields/retry@v3
72+
with:
73+
timeout_minutes: 120
74+
max_attempts: 3
75+
retry_on: error
76+
retry_wait_seconds: 120
77+
command: scripts/build.sh ABTestingUnit ${{ matrix.target }} spm
7078

7179
catalyst:
7280
# Don't run on private repo unless it is a PR.
@@ -81,8 +89,13 @@ jobs:
8189
- uses: ruby/setup-ruby@v1
8290
- name: Setup Bundler
8391
run: scripts/setup_bundler.sh
84-
- name: Setup project and Build for Catalyst
85-
run: scripts/test_catalyst.sh FirebaseABTesting test FirebaseABTesting-Unit-unit
92+
- uses: nick-fields/retry@v3
93+
with:
94+
timeout_minutes: 120
95+
max_attempts: 3
96+
retry_on: error
97+
retry_wait_seconds: 120
98+
command: scripts/test_catalyst.sh FirebaseABTesting test FirebaseABTesting-Unit-unit
8699

87100
quickstart:
88101
# Don't run on private repo unless it is a PR.

‎.github/workflows/auth.yml

+35-13
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,13 @@ jobs:
4444
run: scripts/configure_test_keychain.sh
4545
- name: Xcode
4646
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
47-
- name: Build and test
48-
run: |
49-
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }} --platforms=${{ matrix.target }} \
50-
${{ matrix.tests }}
47+
- uses: nick-fields/retry@v3
48+
with:
49+
timeout_minutes: 120
50+
max_attempts: 3
51+
retry_on: error
52+
retry_wait_seconds: 120
53+
command: scripts/pod_lib_lint.rb ${{ matrix.podspec }} --platforms=${{ matrix.target }} ${{ matrix.tests }}
5154

5255
integration-tests:
5356
# Don't run on private repo unless it is a PR.
@@ -84,8 +87,13 @@ jobs:
8487
FirebaseAuth/Tests/Sample/SwiftApiTests/Credentials.swift "$plist_secret"
8588
- name: Xcode
8689
run: sudo xcode-select -s /Applications/Xcode_15.1.app/Contents/Developer
87-
- name: BuildAndTest # can be replaced with pod lib lint with CocoaPods 1.10
88-
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/build.sh Auth iOS)
90+
- uses: nick-fields/retry@v3
91+
with:
92+
timeout_minutes: 120
93+
max_attempts: 3
94+
retry_on: error
95+
retry_wait_seconds: 120
96+
command: ([ -z $plist_secret ] || scripts/build.sh Auth iOS)
8997

9098
spm:
9199
# Don't run on private repo unless it is a PR.
@@ -111,8 +119,13 @@ jobs:
111119
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
112120
- name: Initialize xcodebuild
113121
run: scripts/setup_spm_tests.sh
114-
- name: Unit Tests
115-
run: scripts/third_party/travis/retry.sh ./scripts/build.sh AuthUnit ${{ matrix.target }} ${{ matrix.test }}
122+
- uses: nick-fields/retry@v3
123+
with:
124+
timeout_minutes: 120
125+
max_attempts: 3
126+
retry_on: error
127+
retry_wait_seconds: 120
128+
command: scripts/third_party/travis/retry.sh ./scripts/build.sh AuthUnit ${{ matrix.target }} ${{ matrix.test }}
116129

117130
catalyst:
118131
# Don't run on private repo unless it is a PR.
@@ -126,9 +139,13 @@ jobs:
126139
- uses: ruby/setup-ruby@v1
127140
- name: Setup Bundler
128141
run: scripts/setup_bundler.sh
129-
- name: Setup project and Build for Catalyst
130-
# Only build the unit tests on Catalyst. Their keychain reliance causes several failures.
131-
run: scripts/test_catalyst.sh FirebaseAuth build FirebaseAuth-Unit-unit
142+
- uses: nick-fields/retry@v3
143+
with:
144+
timeout_minutes: 120
145+
max_attempts: 3
146+
retry_on: error
147+
retry_wait_seconds: 120
148+
command: scripts/test_catalyst.sh FirebaseAuth build FirebaseAuth-Unit-unit
132149

133150
quickstart:
134151
# Don't run on private repo unless it is a PR.
@@ -195,5 +212,10 @@ jobs:
195212
run: scripts/setup_bundler.sh
196213
- name: Configure test keychain
197214
run: scripts/configure_test_keychain.sh
198-
- name: PodLibLint Auth Cron
199-
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAuth.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}
215+
- uses: nick-fields/retry@v3
216+
with:
217+
timeout_minutes: 120
218+
max_attempts: 3
219+
retry_on: error
220+
retry_wait_seconds: 120
221+
command: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAuth.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}

‎.github/workflows/crashlytics.yml

+21-9
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,13 @@ jobs:
4141
run: scripts/setup_bundler.sh
4242
- name: Xcode
4343
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
44-
- name: Build and test
45-
run: |
46-
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCrashlytics.podspec --platforms=${{ matrix.target }} \
47-
${{ matrix.tests }}
44+
- uses: nick-fields/retry@v3
45+
with:
46+
timeout_minutes: 120
47+
max_attempts: 3
48+
retry_on: error
49+
retry_wait_seconds: 120
50+
command: scripts/pod_lib_lint.rb FirebaseCrashlytics.podspec --platforms=${{ matrix.target }} ${{ matrix.tests }}
4851

4952
spm:
5053
# Don't run on private repo unless it is a PR.
@@ -68,9 +71,13 @@ jobs:
6871
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
6972
- name: Initialize xcodebuild
7073
run: scripts/setup_spm_tests.sh
71-
- name: Unit Tests
72-
run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseCrashlyticsUnit ${{ matrix.target }} spm
73-
74+
- uses: nick-fields/retry@v3
75+
with:
76+
timeout_minutes: 120
77+
max_attempts: 3
78+
retry_on: error
79+
retry_wait_seconds: 120
80+
command: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseCrashlyticsUnit ${{ matrix.target }} spm
7481

7582
catalyst:
7683
# Don't run on private repo unless it is a PR.
@@ -85,8 +92,13 @@ jobs:
8592
- uses: ruby/setup-ruby@v1
8693
- name: Setup Bundler
8794
run: scripts/setup_bundler.sh
88-
- name: Setup project and Build for Catalyst
89-
run: scripts/test_catalyst.sh FirebaseCrashlytics test FirebaseCrashlytics-Unit-unit
95+
- uses: nick-fields/retry@v3
96+
with:
97+
timeout_minutes: 120
98+
max_attempts: 3
99+
retry_on: error
100+
retry_wait_seconds: 120
101+
command: scripts/test_catalyst.sh FirebaseCrashlytics test FirebaseCrashlytics-Unit-unit
90102

91103
quickstart:
92104
# Don't run on private repo unless it is a PR.

0 commit comments

Comments
 (0)