From 1a7ab47cd6d53d259f14c946cc9115e1cbf884de Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 23 Oct 2023 07:49:08 -0700 Subject: [PATCH 01/14] Try running matrix for both Xcode 14 and Xcode 15 --- .github/workflows/storage.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index c1a9a22434d..8a191825608 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -20,9 +20,12 @@ jobs: storage: # Don't run on private repo unless it is a PR. if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' + strategy: + matrix: + os: [macos-12, macos-13] env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} - runs-on: macos-12 + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126 From 2a4eca67eb248ed268d4849a01eedb46e8253a83 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 23 Oct 2023 08:26:50 -0700 Subject: [PATCH 02/14] fixes --- .github/workflows/storage.yml | 18 ++++++++++---- scripts/xcresult_logs.py | 44 ++++++++++------------------------- 2 files changed, 26 insertions(+), 36 deletions(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 8a191825608..786b0203e2b 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -52,7 +52,10 @@ jobs: spm: # Don't run on private repo unless it is a PR. if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' - runs-on: macos-12 + strategy: + matrix: + os: [macos-12, macos-13] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126 @@ -66,7 +69,10 @@ jobs: spm-cron: # Don't run on private repo. if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk' - runs-on: macos-12 + strategy: + matrix: + os: [macos-12, macos-13] + runs-on: ${{ matrix.os }} strategy: matrix: target: [tvOS, macOS, catalyst, watchOS] @@ -83,11 +89,14 @@ jobs: quickstart: # Don't run on private repo unless it is a PR. if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' + strategy: + matrix: + os: [macos-12, macos-13] env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} LEGACY: true - runs-on: macos-12 + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 @@ -131,10 +140,11 @@ jobs: pod-lib-lint: # Don't run on private repo unless it is a PR. if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' - runs-on: macos-12 strategy: matrix: + os: [macos-12, macos-13] target: [ios, tvos, macos, watchos] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 diff --git a/scripts/xcresult_logs.py b/scripts/xcresult_logs.py index 744734ebfa7..de73f926a45 100755 --- a/scripts/xcresult_logs.py +++ b/scripts/xcresult_logs.py @@ -54,27 +54,19 @@ def main(): scheme = flags['-scheme'] xcresult_path = find_xcresult_path(project, scheme) - version = find_xcode_major_version() - if version <= 10: - files = find_legacy_log_files(xcresult_path) - cat_files(files, sys.stdout) - + log_id = find_log_id(xcresult_path) + log = export_log(xcresult_path, log_id) + + # Avoid a potential UnicodeEncodeError raised by sys.stdout.write() by + # doing a relaxed encoding ourselves. + if hasattr(sys.stdout, 'buffer'): + log_encoded = log.encode('utf8', errors='backslashreplace') + sys.stdout.flush() + sys.stdout.buffer.write(log_encoded) else: - # Xcode 11 and up ship xcresult tool which standardizes the xcresult format - # but also makes it harder to deal with. - log_id = find_log_id(xcresult_path) - log = export_log(xcresult_path, log_id) - - # Avoid a potential UnicodeEncodeError raised by sys.stdout.write() by - # doing a relaxed encoding ourselves. - if hasattr(sys.stdout, 'buffer'): - log_encoded = log.encode('utf8', errors='backslashreplace') - sys.stdout.flush() - sys.stdout.buffer.write(log_encoded) - else: - log_encoded = log.encode('ascii', errors='backslashreplace') - log_decoded = log_encoded.decode('ascii', errors='strict') - sys.stdout.write(log_decoded) + log_encoded = log.encode('ascii', errors='backslashreplace') + log_decoded = log_encoded.decode('ascii', errors='strict') + sys.stdout.write(log_decoded) # Most flags on the xcodebuild command-line are uninteresting, so only pull @@ -277,18 +269,6 @@ def collect_log_output(activity_log, result): collect_log_output(subsection, result) -def find_xcode_major_version(): - """Determines the major version number of Xcode.""" - cmd = ['xcodebuild', '-version'] - command_trace.log(cmd) - - result = str(subprocess.check_output(cmd)) - version = result.split('\n', 1)[0] - version = re.sub(r'Xcode ', '', version) - version = re.sub(r'\..*', '', version) - return int(version) - - def xcresulttool(*args): """Runs xcresulttool and returns its output as a string.""" cmd = ['xcrun', 'xcresulttool'] From 901bcc74d13f6303d35893201b7d8ce98bd110ba Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 23 Oct 2023 08:28:06 -0700 Subject: [PATCH 03/14] no double strategy --- .github/workflows/storage.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 786b0203e2b..08ea96ce5ad 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -72,10 +72,8 @@ jobs: strategy: matrix: os: [macos-12, macos-13] - runs-on: ${{ matrix.os }} - strategy: - matrix: target: [tvOS, macOS, catalyst, watchOS] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126 From be2f88985c1cecbcaee42cf3fb882d5ec3d93690 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 24 Oct 2023 10:58:28 -0700 Subject: [PATCH 04/14] Use Xcode 15.1 --- .github/workflows/storage.yml | 44 +++++++++++++++++++++++++++++------ scripts/build.sh | 6 ++--- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 08ea96ce5ad..ffd1afe5569 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -22,7 +22,11 @@ jobs: if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' strategy: matrix: - os: [macos-12, macos-13] + include: + - os: macos-12 + xcode: Xcode_14.2 + - os: macos-13 + xcode: Xcode_15.1 env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} runs-on: ${{ matrix.os }} @@ -46,6 +50,8 @@ jobs: run: | scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.swift.gpg \ FirebaseStorage/Tests/Integration/Credentials.swift "$plist_secret" + - name: Xcode + run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer - name: BuildAndTest # can be replaced with pod lib lint with CocoaPods 1.10 run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/build.sh Storage all) @@ -54,13 +60,19 @@ jobs: if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' strategy: matrix: - os: [macos-12, macos-13] + include: + - os: macos-12 + xcode: Xcode_14.2 + - os: macos-13 + xcode: Xcode_15.1 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126 with: cache_key: ${{ matrix.os }} + - name: Xcode + run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer - name: Initialize xcodebuild run: scripts/setup_spm_tests.sh - name: Swift Unit Tests @@ -68,7 +80,7 @@ jobs: spm-cron: # Don't run on private repo. - if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk' +# if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk' strategy: matrix: os: [macos-12, macos-13] @@ -89,7 +101,11 @@ jobs: if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' strategy: matrix: - os: [macos-12, macos-13] + include: + - os: macos-12 + xcode: Xcode_14.2 + - os: macos-13 + xcode: Xcode_15.1 env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} @@ -103,6 +119,8 @@ jobs: - name: Install Secret GoogleService-Info.plist run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-storage.plist.gpg \ quickstart-ios/storage/GoogleService-Info.plist "$plist_secret" + - name: Xcode + run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer - name: Test objc quickstart run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage true) - name: Test swift quickstart @@ -140,30 +158,42 @@ jobs: if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' strategy: matrix: - os: [macos-12, macos-13] target: [ios, tvos, macos, watchos] + include: + - os: macos-12 + xcode: Xcode_14.2 + - os: macos-13 + xcode: Xcode_15.1 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 - name: Setup Bundler run: scripts/setup_bundler.sh + - name: Xcode + run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer - name: Build and test run: | scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseStorage.podspec --test-specs=unit --platforms=${{ matrix.target }} storage-cron-only: # Don't run on private repo. - if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk' +# if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk' runs-on: macos-12 strategy: matrix: - target: [ios, tvos, macos, watchos] + include: + - os: macos-12 + xcode: Xcode_14.2 + - os: macos-13 + xcode: Xcode_15.1 needs: pod-lib-lint steps: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 - name: Setup Bundler run: scripts/setup_bundler.sh + - name: Xcode + run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer - name: PodLibLint Storage Cron run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseStorage.podspec --platforms=${{ matrix.target }} --use-static-frameworks --skip-tests diff --git a/scripts/build.sh b/scripts/build.sh index 61470f453b7..1c0a4895b63 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -137,15 +137,15 @@ function ExportLogs() { python "${scripts_dir}/xcresult_logs.py" "$@" } -if [[ "$xcode_major" -lt 11 ]]; then +if [[ "$xcode_major" -lt 15 ]]; then ios_flags=( -sdk 'iphonesimulator' - -destination 'platform=iOS Simulator,name=iPhone 7' + -destination 'platform=iOS Simulator,name=iPhone 14' ) else ios_flags=( -sdk 'iphonesimulator' - -destination 'platform=iOS Simulator,name=iPhone 11' + -destination 'platform=iOS Simulator,name=iPhone 15' ) fi From ec36044cdf44d742f7f10089d8f6aa5d44bb2688 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 24 Oct 2023 11:09:02 -0700 Subject: [PATCH 05/14] 15.0 --- .github/workflows/storage.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index ffd1afe5569..6eef54676f7 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -26,7 +26,7 @@ jobs: - os: macos-12 xcode: Xcode_14.2 - os: macos-13 - xcode: Xcode_15.1 + xcode: Xcode_15.0 env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} runs-on: ${{ matrix.os }} @@ -64,7 +64,7 @@ jobs: - os: macos-12 xcode: Xcode_14.2 - os: macos-13 - xcode: Xcode_15.1 + xcode: Xcode_15.0 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -105,7 +105,7 @@ jobs: - os: macos-12 xcode: Xcode_14.2 - os: macos-13 - xcode: Xcode_15.1 + xcode: Xcode_15.0 env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} @@ -163,7 +163,7 @@ jobs: - os: macos-12 xcode: Xcode_14.2 - os: macos-13 - xcode: Xcode_15.1 + xcode: Xcode_15.0 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -186,7 +186,7 @@ jobs: - os: macos-12 xcode: Xcode_14.2 - os: macos-13 - xcode: Xcode_15.1 + xcode: Xcode_15.0 needs: pod-lib-lint steps: - uses: actions/checkout@v3 From 2c40b2972025970a9c2054a933cac7596e2e3ee1 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 24 Oct 2023 14:58:52 -0700 Subject: [PATCH 06/14] check in scheme to try to workaround SPM issue --- .github/workflows/storage.yml | 8 ++- .../xcschemes/FirebaseStorageUnit.xcscheme | 52 +++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 .swiftpm/xcode/xcshareddata/xcschemes/FirebaseStorageUnit.xcscheme diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 6eef54676f7..1db3666ac3c 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -83,8 +83,12 @@ jobs: # if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk' strategy: matrix: - os: [macos-12, macos-13] target: [tvOS, macOS, catalyst, watchOS] + include: + - os: macos-12 + xcode: Xcode_14.2 + - os: macos-13 + xcode: Xcode_15.0 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -179,7 +183,6 @@ jobs: storage-cron-only: # Don't run on private repo. # if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk' - runs-on: macos-12 strategy: matrix: include: @@ -187,6 +190,7 @@ jobs: xcode: Xcode_14.2 - os: macos-13 xcode: Xcode_15.0 + runs-on: ${{ matrix.os }} needs: pod-lib-lint steps: - uses: actions/checkout@v3 diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/FirebaseStorageUnit.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/FirebaseStorageUnit.xcscheme new file mode 100644 index 00000000000..f612bb43f8a --- /dev/null +++ b/.swiftpm/xcode/xcshareddata/xcschemes/FirebaseStorageUnit.xcscheme @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + From 6ea7a575a08be5bb603034237672df0e5a877375 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 24 Oct 2023 15:29:04 -0700 Subject: [PATCH 07/14] try deriveddata workaround --- .../xcschemes/FirebaseStorageUnit.xcscheme | 52 ------------------- scripts/build.sh | 7 +++ 2 files changed, 7 insertions(+), 52 deletions(-) delete mode 100644 .swiftpm/xcode/xcshareddata/xcschemes/FirebaseStorageUnit.xcscheme diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/FirebaseStorageUnit.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/FirebaseStorageUnit.xcscheme deleted file mode 100644 index f612bb43f8a..00000000000 --- a/.swiftpm/xcode/xcshareddata/xcschemes/FirebaseStorageUnit.xcscheme +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/scripts/build.sh b/scripts/build.sh index 1c0a4895b63..6d41624b56d 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -683,11 +683,18 @@ case "$product-$platform-$method" in # Note that the combine tests require setting the minimum iOS and tvOS version to 13.0 *-*-spm) + ifeq ($(origin RUNNER_TEMP),undefined) + DERIVED_DATA_PATH=.derivedData + else + DERIVED_DATA_PATH="$(RUNNER_TEMP)/derivedData" + endif + RunXcodebuild \ -scheme $product \ "${xcb_flags[@]}" \ IPHONEOS_DEPLOYMENT_TARGET=13.0 \ TVOS_DEPLOYMENT_TARGET=13.0 \ + "$(DERIVED_DATA_PATH)" \ test ;; From ec6da80e7c37621b0e51c067ea664e7c0bb48f14 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 24 Oct 2023 15:47:41 -0700 Subject: [PATCH 08/14] undo build.sh changes --- scripts/build.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 6d41624b56d..1c0a4895b63 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -683,18 +683,11 @@ case "$product-$platform-$method" in # Note that the combine tests require setting the minimum iOS and tvOS version to 13.0 *-*-spm) - ifeq ($(origin RUNNER_TEMP),undefined) - DERIVED_DATA_PATH=.derivedData - else - DERIVED_DATA_PATH="$(RUNNER_TEMP)/derivedData" - endif - RunXcodebuild \ -scheme $product \ "${xcb_flags[@]}" \ IPHONEOS_DEPLOYMENT_TARGET=13.0 \ TVOS_DEPLOYMENT_TARGET=13.0 \ - "$(DERIVED_DATA_PATH)" \ test ;; From c42ef0a11e91e59034220b202c6a221ae8848880 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 24 Oct 2023 16:01:03 -0700 Subject: [PATCH 09/14] matrix fixes --- .github/workflows/storage.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 1db3666ac3c..13a2c9c5819 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -84,6 +84,7 @@ jobs: strategy: matrix: target: [tvOS, macOS, catalyst, watchOS] + os: [macos-12, macos-13] include: - os: macos-12 xcode: Xcode_14.2 @@ -95,6 +96,8 @@ jobs: - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126 with: cache_key: ${{ matrix.os }} + - name: Xcode + run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer - name: Initialize xcodebuild run: scripts/setup_spm_tests.sh - name: Unit Tests @@ -162,7 +165,9 @@ jobs: if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' strategy: matrix: - target: [ios, tvos, macos, watchos] + # TODO: restore ios + target: [tvos, macos, watchos] + os: [macos-12, macos-13] include: - os: macos-12 xcode: Xcode_14.2 From 64391cb1d173d99075fee3c2adbce2d95de72233 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 24 Oct 2023 16:52:01 -0700 Subject: [PATCH 10/14] fixes --- .github/workflows/storage.yml | 5 +++-- CocoapodsIntegrationTest/scripts/build_with_environment.sh | 2 +- scripts/zip_quickstart_test.sh | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 13a2c9c5819..3a5854c4e37 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -165,8 +165,7 @@ jobs: if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' strategy: matrix: - # TODO: restore ios - target: [tvos, macos, watchos] + target: [ios, tvos, macos, watchos] os: [macos-12, macos-13] include: - os: macos-12 @@ -190,6 +189,8 @@ jobs: # if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk' strategy: matrix: + target: [ios, tvos, macos, watchos] + os: [macos-12, macos-13] include: - os: macos-12 xcode: Xcode_14.2 diff --git a/CocoapodsIntegrationTest/scripts/build_with_environment.sh b/CocoapodsIntegrationTest/scripts/build_with_environment.sh index b78d70c0ec1..cd851a206c2 100755 --- a/CocoapodsIntegrationTest/scripts/build_with_environment.sh +++ b/CocoapodsIntegrationTest/scripts/build_with_environment.sh @@ -27,7 +27,7 @@ function runXcodebuild() { -workspace 'CocoapodsIntegrationTest.xcworkspace' -scheme 'CocoapodsIntegrationTest' -sdk 'iphonesimulator' - -destination 'platform=iOS Simulator,name=iPhone 11' + -destination 'platform=iOS Simulator,name=iPhone 15' CODE_SIGNING_REQUIRED=NO clean build diff --git a/scripts/zip_quickstart_test.sh b/scripts/zip_quickstart_test.sh index 9aec359fa4d..d1e8e8a8b43 100755 --- a/scripts/zip_quickstart_test.sh +++ b/scripts/zip_quickstart_test.sh @@ -34,7 +34,7 @@ fi xcodebuild \ -project ${SAMPLE}Example.xcodeproj \ -scheme ${SAMPLE}Example${SWIFT_SUFFIX} \ --destination 'platform=iOS Simulator,name=iPhone 11 Pro' "SWIFT_VERSION=5.3" "OTHER_LDFLAGS=\$(OTHER_LDFLAGS) -ObjC" "FRAMEWORK_SEARCH_PATHS= \$(PROJECT_DIR)/Firebase/" HEADER_SEARCH_PATHS='$(PROJECT_DIR)/Firebase' \ +-destination 'platform=iOS Simulator,name=iPhone 15' "SWIFT_VERSION=5.3" "OTHER_LDFLAGS=\$(OTHER_LDFLAGS) -ObjC" "FRAMEWORK_SEARCH_PATHS= \$(PROJECT_DIR)/Firebase/" HEADER_SEARCH_PATHS='$(PROJECT_DIR)/Firebase' \ build \ test \ ) || EXIT_STATUS=$? From 05b09d85791dca9e5c57521f7bdbf4948bb7618a Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 24 Oct 2023 17:35:35 -0700 Subject: [PATCH 11/14] try 15.0.1 --- .github/workflows/storage.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 3a5854c4e37..b5387d03bd8 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -26,7 +26,7 @@ jobs: - os: macos-12 xcode: Xcode_14.2 - os: macos-13 - xcode: Xcode_15.0 + xcode: xcode_15.0.1 env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} runs-on: ${{ matrix.os }} @@ -64,7 +64,7 @@ jobs: - os: macos-12 xcode: Xcode_14.2 - os: macos-13 - xcode: Xcode_15.0 + xcode: xcode_15.0.1 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -89,7 +89,7 @@ jobs: - os: macos-12 xcode: Xcode_14.2 - os: macos-13 - xcode: Xcode_15.0 + xcode: xcode_15.0.1 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 @@ -112,7 +112,7 @@ jobs: - os: macos-12 xcode: Xcode_14.2 - os: macos-13 - xcode: Xcode_15.0 + xcode: xcode_15.0.1 env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} @@ -171,13 +171,15 @@ jobs: - os: macos-12 xcode: Xcode_14.2 - os: macos-13 - xcode: Xcode_15.0 + xcode: xcode_15.0.1 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 - name: Setup Bundler run: scripts/setup_bundler.sh + - name: Xcodes + run: ls -l /Applications/Xcode* - name: Xcode run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer - name: Build and test @@ -195,7 +197,7 @@ jobs: - os: macos-12 xcode: Xcode_14.2 - os: macos-13 - xcode: Xcode_15.0 + xcode: xcode_15.0.1 runs-on: ${{ matrix.os }} needs: pod-lib-lint steps: From 35001be5845cad3a66a272a78041dc3104dcc5b6 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 24 Oct 2023 17:49:34 -0700 Subject: [PATCH 12/14] more data --- .github/workflows/storage.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index b5387d03bd8..27f77a6f51d 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -96,6 +96,8 @@ jobs: - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126 with: cache_key: ${{ matrix.os }} + - name: Xcodes + run: ls -l /Applications/Xcode* - name: Xcode run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer - name: Initialize xcodebuild From 45636cf730a81f09c17dc114862c776725cc2e30 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 24 Oct 2023 17:51:14 -0700 Subject: [PATCH 13/14] fix --- CocoapodsIntegrationTest/scripts/build_with_environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CocoapodsIntegrationTest/scripts/build_with_environment.sh b/CocoapodsIntegrationTest/scripts/build_with_environment.sh index cd851a206c2..f413c9ed5b2 100755 --- a/CocoapodsIntegrationTest/scripts/build_with_environment.sh +++ b/CocoapodsIntegrationTest/scripts/build_with_environment.sh @@ -27,7 +27,7 @@ function runXcodebuild() { -workspace 'CocoapodsIntegrationTest.xcworkspace' -scheme 'CocoapodsIntegrationTest' -sdk 'iphonesimulator' - -destination 'platform=iOS Simulator,name=iPhone 15' + -destination 'platform=iOS Simulator,name=iPhone 14' CODE_SIGNING_REQUIRED=NO clean build From 8a6b5a83f5268df1d145675c83e460ce529e1b4f Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Wed, 25 Oct 2023 07:04:21 -0700 Subject: [PATCH 14/14] integration test fix? --- .github/workflows/storage.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 27f77a6f51d..940cb5a4816 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -23,8 +23,9 @@ jobs: strategy: matrix: include: - - os: macos-12 - xcode: Xcode_14.2 + # Only one os to avoid contention in the integration tests. + # - os: macos-12 + # xcode: Xcode_14.2 - os: macos-13 xcode: xcode_15.0.1 env: