Skip to content

Commit 1e64cf9

Browse files
committed
Disable
1 parent 690a1af commit 1e64cf9

File tree

2 files changed

+36
-31
lines changed

2 files changed

+36
-31
lines changed

.github/workflows/combine.yml

+34-28
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414

1515
name: combine
1616

17+
permissions:
18+
contents: read
19+
1720
on:
1821
workflow_dispatch:
1922
pull_request:
@@ -72,31 +75,34 @@ jobs:
7275
- name: Build and test
7376
run: scripts/third_party/travis/retry.sh scripts/build.sh CombineSwift ${{ matrix.target }} xcodebuild
7477

75-
storage-combine-integration:
76-
# Don't run on private repo unless it is a PR.
77-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || contains(fromJSON('["pull_request", "workflow_dispatch"]'), github.event_name)
78-
env:
79-
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
80-
runs-on: macos-15
81-
steps:
82-
- uses: actions/checkout@v4
83-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
84-
with:
85-
cache_key: ${{ matrix.os }}
86-
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
87-
- name: Setup Bundler
88-
run: scripts/setup_bundler.sh
89-
- name: Install xcpretty
90-
run: gem install xcpretty
91-
- name: Install Secret GoogleService-Info.plist
92-
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/storage-db-plist.gpg \
93-
FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist "$plist_secret"
94-
- name: Install Credentials.h
95-
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.h.gpg \
96-
FirebaseStorage/Tests/ObjCIntegration/Credentials.h "$plist_secret"
97-
- name: Install Credentials.swift
98-
run: |
99-
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.swift.gpg \
100-
FirebaseStorage/Tests/Integration/Credentials.swift "$plist_secret"
101-
- name: BuildAndTest # can be replaced with pod lib lint with CocoaPods 1.10
102-
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/build.sh StorageCombine all)
78+
# TODO: These tests started failing in Xcode 16. Using the iOS 18.4 simulator
79+
# crashes locally due to its networking issues. Using the iOS 18.3.1 simulator
80+
# works locally, but crashes on CI.
81+
# storage-combine-integration:
82+
# # Don't run on private repo unless it is a PR.
83+
# if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || contains(fromJSON('["pull_request", "workflow_dispatch"]'), github.event_name)
84+
# env:
85+
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
86+
# runs-on: macos-15
87+
# steps:
88+
# - uses: actions/checkout@v4
89+
# - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
90+
# with:
91+
# cache_key: ${{ matrix.os }}
92+
# - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
93+
# - name: Setup Bundler
94+
# run: scripts/setup_bundler.sh
95+
# - name: Install xcpretty
96+
# run: gem install xcpretty
97+
# - name: Install Secret GoogleService-Info.plist
98+
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/storage-db-plist.gpg \
99+
# FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist "$plist_secret"
100+
# - name: Install Credentials.h
101+
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.h.gpg \
102+
# FirebaseStorage/Tests/ObjCIntegration/Credentials.h "$plist_secret"
103+
# - name: Install Credentials.swift
104+
# run: |
105+
# scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.swift.gpg \
106+
# FirebaseStorage/Tests/Integration/Credentials.swift "$plist_secret"
107+
# - name: BuildAndTest # can be replaced with pod lib lint with CocoaPods 1.10
108+
# run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/build.sh StorageCombine all)

scripts/build.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -321,14 +321,13 @@ case "$product-$platform-$method" in
321321
fi
322322
;;
323323

324-
# TODO(ncooke3): Avoids 18.4 failures. Remove -sdk and -destination flags and replace with "${xcb_flags[@]}"
325324
CombineSwift-*-xcodebuild)
326325
pod_gen FirebaseCombineSwift.podspec --platforms=ios
327326
RunXcodebuild \
328327
-workspace 'gen/FirebaseCombineSwift/FirebaseCombineSwift.xcworkspace' \
329328
-scheme "FirebaseCombineSwift-Unit-unit" \
330-
-sdk 'iphonesimulator' \
331-
-destination 'platform=iOS Simulator,name=iPhone 16,OS=18.3.1' \
329+
"${xcb_flags[@]}" \
330+
build \
332331
test
333332
;;
334333

0 commit comments

Comments
 (0)