Skip to content

Commit 6123787

Browse files
ncooke3ncooke3
committed
revert?
1 parent 795e388 commit 6123787

File tree

1 file changed

+77
-82
lines changed

1 file changed

+77
-82
lines changed

‎.github/workflows/storage.yml‎

Lines changed: 77 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -25,90 +25,85 @@ concurrency:
2525
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
2626
cancel-in-progress: true
2727

28-
#jobs:
29-
# spm:
30-
# uses: ./.github/workflows/common.yml
31-
# with:
32-
# target: FirebaseStorageUnit
33-
#
34-
# catalyst:
35-
# uses: ./.github/workflows/common_catalyst.yml
36-
# with:
37-
# product: FirebaseStorage
38-
# target: FirebaseStorage-Unit-unit
39-
#
40-
# storage-integration-tests:
41-
# # Don't run on private repo unless it is a PR.
42-
# if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
43-
# strategy:
44-
# matrix:
45-
# language: [Swift, ObjC]
46-
# include:
47-
# - os: macos-15
48-
# xcode: Xcode_16.4
49-
# env:
50-
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
51-
# runs-on: ${{ matrix.os }}
52-
# steps:
53-
# - uses: actions/checkout@v4
54-
# - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
55-
# with:
56-
# cache_key: integration${{ matrix.os }}
57-
# - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
58-
# - name: Setup Bundler
59-
# run: scripts/setup_bundler.sh
60-
# - name: Install xcpretty
61-
# run: gem install xcpretty
62-
# - name: Install Secret GoogleService-Info.plist
63-
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/storage-db-plist.gpg \
64-
# FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist "$plist_secret"
65-
# - name: Install Credentials.h
66-
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.h.gpg \
67-
# FirebaseStorage/Tests/ObjCIntegration/Credentials.h "$plist_secret"
68-
# - name: Install Credentials.swift
69-
# run: |
70-
# scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.swift.gpg \
71-
# FirebaseStorage/Tests/Integration/Credentials.swift "$plist_secret"
72-
# - name: Xcode
73-
# run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
74-
# - uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
75-
# with:
76-
# timeout_minutes: 15
77-
# max_attempts: 3
78-
# retry_wait_seconds: 120
79-
# command: ([ -z $plist_secret ] || scripts/build.sh Storage${{ matrix.language }} all)
80-
#
81-
# quickstart:
82-
# # TODO: See #12399 and restore Objective-C testing for Xcode 15 if GHA is fixed.
83-
# uses: ./.github/workflows/common_quickstart.yml
84-
# with:
85-
# product: Storage
86-
# setup_command: scripts/setup_quickstart_spm.sh storage
87-
# plist_src_path: scripts/gha-encrypted/qs-storage.plist.gpg
88-
# plist_dst_path: quickstart-ios/storage/GoogleService-Info.plist
89-
# run_tests: false
90-
# secrets:
91-
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
92-
9328
jobs:
94-
quickstart-ftl-cron-only:
95-
# Don't run on private repo.
96-
if: github.repository == 'Firebase/firebase-ios-sdk'
29+
spm:
30+
uses: ./.github/workflows/common.yml
31+
with:
32+
target: FirebaseStorageUnit
33+
34+
catalyst:
35+
uses: ./.github/workflows/common_catalyst.yml
36+
with:
37+
product: FirebaseStorage
38+
target: FirebaseStorage-Unit-unit
39+
40+
storage-integration-tests:
41+
# Don't run on private repo unless it is a PR.
42+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
43+
strategy:
44+
matrix:
45+
language: [Swift, ObjC]
46+
include:
47+
- os: macos-15
48+
xcode: Xcode_16.4
9749
env:
9850
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
99-
runs-on: macos-15
51+
runs-on: ${{ matrix.os }}
10052
steps:
10153
- uses: actions/checkout@v4
54+
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
55+
with:
56+
cache_key: integration${{ matrix.os }}
10257
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
10358
- name: Setup Bundler
10459
run: scripts/setup_bundler.sh
10560
- name: Install xcpretty
10661
run: gem install xcpretty
62+
- name: Install Secret GoogleService-Info.plist
63+
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/storage-db-plist.gpg \
64+
FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist "$plist_secret"
65+
- name: Install Credentials.h
66+
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.h.gpg \
67+
FirebaseStorage/Tests/ObjCIntegration/Credentials.h "$plist_secret"
68+
- name: Install Credentials.swift
69+
run: |
70+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.swift.gpg \
71+
FirebaseStorage/Tests/Integration/Credentials.swift "$plist_secret"
72+
- name: Xcode
73+
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
74+
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
75+
with:
76+
timeout_minutes: 15
77+
max_attempts: 3
78+
retry_wait_seconds: 120
79+
command: ([ -z $plist_secret ] || scripts/build.sh Storage${{ matrix.language }} all)
80+
81+
quickstart:
82+
# TODO: See #12399 and restore Objective-C testing for Xcode 15 if GHA is fixed.
83+
uses: ./.github/workflows/common_quickstart.yml
84+
with:
85+
product: Storage
86+
setup_command: scripts/setup_quickstart_spm.sh storage
87+
plist_src_path: scripts/gha-encrypted/qs-storage.plist.gpg
88+
plist_dst_path: quickstart-ios/storage/GoogleService-Info.plist
89+
run_tests: false
90+
secrets:
91+
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
92+
93+
quickstart-ftl-cron-only:
94+
# Don't run on private repo.
95+
if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule'
96+
env:
97+
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
98+
runs-on: macos-15
99+
steps:
100+
- uses: actions/checkout@v4
101+
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
107102
- uses: actions/setup-python@v5
108103
with:
109104
python-version: '3.11'
110105
- name: Setup quickstart
111-
run: QUICKSTART_BRANCH=nc/strg-tests scripts/setup_quickstart_spm.sh storage
106+
run: scripts/setup_quickstart.sh storage
112107
- name: Install Secret GoogleService-Info.plist
113108
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-storage.plist.gpg \
114109
quickstart-ios/storage/GoogleService-Info.plist "$plist_secret"
@@ -123,16 +118,16 @@ jobs:
123118
testapp_dir: quickstart-ios/build-for-testing
124119
test_type: "xctest"
125120

126-
# pod_lib_lint:
127-
# uses: ./.github/workflows/common_cocoapods.yml
128-
# with:
129-
# product: FirebaseStorage
130-
# test_specs: unit
121+
pod_lib_lint:
122+
uses: ./.github/workflows/common_cocoapods.yml
123+
with:
124+
product: FirebaseStorage
125+
test_specs: unit
131126

132-
# storage-cron-only:
133-
# needs: pod_lib_lint
134-
# uses: ./.github/workflows/common_cocoapods_cron.yml
135-
# with:
136-
# product: FirebaseStorage
137-
# platforms: '[ "ios", "tvos", "macos", "watchos" ]'
138-
# flags: '[ "--use-static-frameworks --skip-tests" ]'
127+
storage-cron-only:
128+
needs: pod_lib_lint
129+
uses: ./.github/workflows/common_cocoapods_cron.yml
130+
with:
131+
product: FirebaseStorage
132+
platforms: '[ "ios", "tvos", "macos", "watchos" ]'
133+
flags: '[ "--use-static-frameworks --skip-tests" ]'

0 commit comments

Comments
 (0)