From dd84b8e6bc0dededb7b4ca93c8ea874078c71c9a Mon Sep 17 00:00:00 2001 From: Andrew Heard Date: Thu, 17 Apr 2025 12:10:53 -0400 Subject: [PATCH 1/3] [Infra] Move `--legacy` flag into `xcresulttool_json` function --- scripts/xcresult_logs.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/xcresult_logs.py b/scripts/xcresult_logs.py index 980c701da95..207f513e96b 100755 --- a/scripts/xcresult_logs.py +++ b/scripts/xcresult_logs.py @@ -245,10 +245,7 @@ def export_log(xcresult_path, log_id): Returns: The logged output, as a string. """ - # Note: --legacy is required for Xcode 16. - contents = xcresulttool_json( - 'get', '--path', xcresult_path, '--id', log_id, '--legacy' - ) + contents = xcresulttool_json('get', '--path', xcresult_path, '--id', log_id) result = [] collect_log_output(contents, result) @@ -284,7 +281,8 @@ def xcresulttool(*args): def xcresulttool_json(*args): """Runs xcresulttool and its output as parsed JSON.""" - args = list(args) + ['--format', 'json'] + # Note: --legacy is required for Xcode 16. + args = list(args) + ['--format', 'json', '--legacy'] contents = xcresulttool(*args) return json.loads(contents) From d43ad528fc167619807a5a061393e3cedb758746 Mon Sep 17 00:00:00 2001 From: Andrew Heard Date: Thu, 17 Apr 2025 12:18:40 -0400 Subject: [PATCH 2/3] Touch `database.yml` to trigger integration test --- .github/workflows/database.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index 4f6ef256257..af8259ae2ad 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -44,6 +44,7 @@ jobs: run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseDatabase.podspec --test-specs=unit --platforms=${{ matrix.target }} integration: + # TODO: Remove this comment after testing. # 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-15 From da8b9edbf2367fcf116b8335eda0faf953ae772e Mon Sep 17 00:00:00 2001 From: Andrew Heard Date: Thu, 17 Apr 2025 12:26:44 -0400 Subject: [PATCH 3/3] Revert "Touch `database.yml` to trigger integration test" This reverts commit d43ad528fc167619807a5a061393e3cedb758746. --- .github/workflows/database.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index af8259ae2ad..4f6ef256257 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -44,7 +44,6 @@ jobs: run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseDatabase.podspec --test-specs=unit --platforms=${{ matrix.target }} integration: - # TODO: Remove this comment after testing. # 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-15