Skip to content

Commit 55ef3ce

Browse files
ncooke3ncooke3
authored
Retry on error or timeout
1 parent 63723a2 commit 55ef3ce

File tree

7 files changed

+97
-107
lines changed

7 files changed

+97
-107
lines changed

‎.github/workflows/auth.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ jobs:
8888
with:
8989
timeout_minutes: 120
9090
max_attempts: 3
91-
retry_on: error
9291
retry_wait_seconds: 120
9392
command: ([ -z $plist_secret ] || scripts/build.sh Auth iOS ${{ matrix.scheme }})
9493

@@ -166,6 +165,5 @@ jobs:
166165
with:
167166
timeout_minutes: 120
168167
max_attempts: 3
169-
retry_on: error
170168
retry_wait_seconds: 120
171169
command: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAuth.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}

‎.github/workflows/common.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ jobs:
114114
with:
115115
timeout_minutes: 120
116116
max_attempts: 3
117-
retry_on: error
118117
retry_wait_seconds: 120
119118
command: |
120119
./scripts/build.sh \

‎.github/workflows/common_catalyst.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ jobs:
4343
with:
4444
timeout_minutes: 120
4545
max_attempts: 3
46-
retry_on: error
4746
retry_wait_seconds: 120
4847
command: |
4948
scripts/test_catalyst.sh \

‎.github/workflows/common_cocoapods.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ jobs:
141141
with:
142142
timeout_minutes: 120
143143
max_attempts: 3
144-
retry_on: error
145144
retry_wait_seconds: 120
146145
command: |
147146
scripts/pod_lib_lint.rb ${{ inputs.product }}.podspec --platforms=${{ matrix.platform }} \

‎.github/workflows/crashlytics.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,5 @@ jobs:
135135
with:
136136
timeout_minutes: 120
137137
max_attempts: 3
138-
retry_on: error
139138
retry_wait_seconds: 120
140139
command: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCrashlytics.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}

‎.github/workflows/spm.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ jobs:
8383
with:
8484
timeout_minutes: 120
8585
max_attempts: 3
86-
retry_on: error
8786
retry_wait_seconds: 120
8887
command: scripts/build.sh Firebase-Package iOS ${{ matrix.test }}
8988

‎.github/workflows/storage.yml‎

Lines changed: 97 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,23 @@ concurrency:
2424
cancel-in-progress: true
2525

2626
jobs:
27-
# spm:
28-
# uses: ./.github/workflows/common.yml
29-
# with:
30-
# target: FirebaseStorageUnit
27+
spm:
28+
uses: ./.github/workflows/common.yml
29+
with:
30+
target: FirebaseStorageUnit
3131

32-
# catalyst:
33-
# uses: ./.github/workflows/common_catalyst.yml
34-
# with:
35-
# product: FirebaseStorage
36-
# target: FirebaseStorage-Unit-unit
32+
catalyst:
33+
uses: ./.github/workflows/common_catalyst.yml
34+
with:
35+
product: FirebaseStorage
36+
target: FirebaseStorage-Unit-unit
3737

3838
storage-integration-tests:
3939
# Don't run on private repo unless it is a PR.
4040
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
4141
strategy:
4242
matrix:
43-
# language: [Swift, ObjC]
44-
language: [ObjC]
43+
language: [Swift, ObjC]
4544
include:
4645
- os: macos-15
4746
xcode: Xcode_16.4
@@ -74,96 +73,94 @@ jobs:
7473
with:
7574
timeout_minutes: 120
7675
max_attempts: 3
77-
# retry_wait_seconds: 120
78-
retry_wait_seconds: 1
79-
# command: ([ -z $plist_secret ] || scripts/build.sh Storage${{ matrix.language }} all)
80-
command: exit 1
76+
retry_wait_seconds: 120
77+
command: ([ -z $plist_secret ] || scripts/build.sh Storage${{ matrix.language }} all)
8178

82-
# quickstart:
83-
# # Don't run on private repo unless it is a PR.
84-
# if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
85-
# # TODO: See #12399 and restore Objective-C testing for Xcode 15 if GHA is fixed.
86-
# strategy:
87-
# matrix:
88-
# include:
89-
# #- os: macos-13
90-
# # xcode: Xcode_14.2 # TODO: the legacy ObjC quickstart doesn't build with Xcode 15.
91-
# - swift: swift
92-
# os: macos-15
93-
# xcode: Xcode_16.4
94-
# env:
95-
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
96-
# signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
97-
# LEGACY: true
98-
# runs-on: ${{ matrix.os }}
99-
# steps:
100-
# - uses: actions/checkout@v4
101-
# - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
102-
# - name: Setup quickstart
103-
# run: scripts/setup_quickstart.sh storage
104-
# - name: Install Secret GoogleService-Info.plist
105-
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-storage.plist.gpg \
106-
# quickstart-ios/storage/GoogleService-Info.plist "$plist_secret"
107-
# - name: Xcode
108-
# run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
109-
# - name: Test quickstart
110-
# run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage false ${{ matrix.swift }})
79+
quickstart:
80+
# Don't run on private repo unless it is a PR.
81+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
82+
# TODO: See #12399 and restore Objective-C testing for Xcode 15 if GHA is fixed.
83+
strategy:
84+
matrix:
85+
include:
86+
#- os: macos-13
87+
# xcode: Xcode_14.2 # TODO: the legacy ObjC quickstart doesn't build with Xcode 15.
88+
- swift: swift
89+
os: macos-15
90+
xcode: Xcode_16.4
91+
env:
92+
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
93+
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
94+
LEGACY: true
95+
runs-on: ${{ matrix.os }}
96+
steps:
97+
- uses: actions/checkout@v4
98+
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
99+
- name: Setup quickstart
100+
run: scripts/setup_quickstart.sh storage
101+
- name: Install Secret GoogleService-Info.plist
102+
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-storage.plist.gpg \
103+
quickstart-ios/storage/GoogleService-Info.plist "$plist_secret"
104+
- name: Xcode
105+
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
106+
- name: Test quickstart
107+
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage false ${{ matrix.swift }})
111108

112-
# quickstart-ftl-cron-only:
113-
# # Don't run on private repo.
114-
# if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule'
115-
# env:
116-
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
117-
# signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
118-
# LEGACY: true
119-
# runs-on: macos-15
120-
# steps:
121-
# - uses: actions/checkout@v4
122-
# - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
123-
# - uses: actions/setup-python@v5
124-
# with:
125-
# python-version: '3.11'
126-
# - name: Setup quickstart
127-
# run: scripts/setup_quickstart.sh storage
128-
# - name: Install Secret GoogleService-Info.plist
129-
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-storage.plist.gpg \
130-
# quickstart-ios/storage/GoogleService-Info.plist "$plist_secret"
131-
# # - name: Build objc quickstart
132-
# # run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh Storage)
133-
# - name: Build swift quickstart
134-
# run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh Storage swift)
135-
# - id: ftl_test
136-
# uses: FirebaseExtended/github-actions/[email protected]
137-
# with:
138-
# credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }}
139-
# testapp_dir: quickstart-ios/build-for-testing
140-
# test_type: "xctest"
109+
quickstart-ftl-cron-only:
110+
# Don't run on private repo.
111+
if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule'
112+
env:
113+
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
114+
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
115+
LEGACY: true
116+
runs-on: macos-15
117+
steps:
118+
- uses: actions/checkout@v4
119+
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
120+
- uses: actions/setup-python@v5
121+
with:
122+
python-version: '3.11'
123+
- name: Setup quickstart
124+
run: scripts/setup_quickstart.sh storage
125+
- name: Install Secret GoogleService-Info.plist
126+
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-storage.plist.gpg \
127+
quickstart-ios/storage/GoogleService-Info.plist "$plist_secret"
128+
# - name: Build objc quickstart
129+
# run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh Storage)
130+
- name: Build swift quickstart
131+
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh Storage swift)
132+
- id: ftl_test
133+
uses: FirebaseExtended/github-actions/[email protected]
134+
with:
135+
credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }}
136+
testapp_dir: quickstart-ios/build-for-testing
137+
test_type: "xctest"
141138

142-
# pod_lib_lint:
143-
# uses: ./.github/workflows/common_cocoapods.yml
144-
# with:
145-
# product: FirebaseStorage
146-
# test_specs: unit
139+
pod_lib_lint:
140+
uses: ./.github/workflows/common_cocoapods.yml
141+
with:
142+
product: FirebaseStorage
143+
test_specs: unit
147144

148-
# storage-cron-only:
149-
# # Don't run on private repo.
150-
# if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
151-
# strategy:
152-
# matrix:
153-
# target: [ios, tvos, macos, watchos]
154-
# build-env:
155-
# - os: macos-14
156-
# xcode: Xcode_16.2
157-
# - os: macos-15
158-
# xcode: Xcode_16.4
159-
# runs-on: ${{ matrix.build-env.os }}
160-
# needs: pod_lib_lint
161-
# steps:
162-
# - uses: actions/checkout@v4
163-
# - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
164-
# - name: Setup Bundler
165-
# run: scripts/setup_bundler.sh
166-
# - name: Xcode
167-
# run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
168-
# - name: PodLibLint Storage Cron
169-
# run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseStorage.podspec --platforms=${{ matrix.target }} --use-static-frameworks --skip-tests
145+
storage-cron-only:
146+
# Don't run on private repo.
147+
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
148+
strategy:
149+
matrix:
150+
target: [ios, tvos, macos, watchos]
151+
build-env:
152+
- os: macos-14
153+
xcode: Xcode_16.2
154+
- os: macos-15
155+
xcode: Xcode_16.4
156+
runs-on: ${{ matrix.build-env.os }}
157+
needs: pod_lib_lint
158+
steps:
159+
- uses: actions/checkout@v4
160+
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
161+
- name: Setup Bundler
162+
run: scripts/setup_bundler.sh
163+
- name: Xcode
164+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
165+
- name: PodLibLint Storage Cron
166+
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseStorage.podspec --platforms=${{ matrix.target }} --use-static-frameworks --skip-tests

0 commit comments

Comments
 (0)