From 39676a3628e2b6d67374371233f7f4019996349b Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Fri, 8 Aug 2025 10:38:04 +0000 Subject: [PATCH 1/7] ci(firestore): add `--ignore-timeouts` flag for cloud firestore e2e tests --- .github/workflows/ios.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios.yaml b/.github/workflows/ios.yaml index 1c7d80a8c6bb..64ec857cfc38 100644 --- a/.github/workflows/ios.yaml +++ b/.github/workflows/ios.yaml @@ -115,4 +115,4 @@ jobs: run: | # Uncomment following line to have simulator logs printed out for debugging purposes. # xcrun simctl spawn booted log stream --predicate 'eventMessage contains "flutter"' & - flutter test integration_test/e2e_test.dart -d "$SIMULATOR" --dart-define=CI=true + flutter test integration_test/e2e_test.dart -d "$SIMULATOR" --dart-define=CI=true ${{ contains(matrix.working_directory, 'cloud_firestore') && '--ignore-timeouts' || '' }} From dc76044f6b0ade660640b359c61e670a24a30ae5 Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Fri, 8 Aug 2025 12:14:35 +0000 Subject: [PATCH 2/7] chore: set timeout-minutes value to 60 --- .github/workflows/ios.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios.yaml b/.github/workflows/ios.yaml index 64ec857cfc38..8e734e3ab448 100644 --- a/.github/workflows/ios.yaml +++ b/.github/workflows/ios.yaml @@ -27,7 +27,7 @@ on: jobs: ios: runs-on: macos-15 - timeout-minutes: 45 + timeout-minutes: 60 strategy: fail-fast: false matrix: From a99deae2fdc3d9b036c350144b31260a7c8ca3b6 Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Mon, 11 Aug 2025 08:21:03 +0000 Subject: [PATCH 3/7] remove --ignore-timeouts flag --- .github/workflows/ios.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios.yaml b/.github/workflows/ios.yaml index 8e734e3ab448..682b3c537713 100644 --- a/.github/workflows/ios.yaml +++ b/.github/workflows/ios.yaml @@ -115,4 +115,4 @@ jobs: run: | # Uncomment following line to have simulator logs printed out for debugging purposes. # xcrun simctl spawn booted log stream --predicate 'eventMessage contains "flutter"' & - flutter test integration_test/e2e_test.dart -d "$SIMULATOR" --dart-define=CI=true ${{ contains(matrix.working_directory, 'cloud_firestore') && '--ignore-timeouts' || '' }} + flutter test integration_test/e2e_test.dart -d "$SIMULATOR" --dart-define=CI=true From 5d3045555ad72e91e3cf294c61a8c7adde3f3e06 Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Mon, 11 Aug 2025 09:03:07 +0000 Subject: [PATCH 4/7] revert change --- .github/workflows/ios.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios.yaml b/.github/workflows/ios.yaml index 682b3c537713..8e734e3ab448 100644 --- a/.github/workflows/ios.yaml +++ b/.github/workflows/ios.yaml @@ -115,4 +115,4 @@ jobs: run: | # Uncomment following line to have simulator logs printed out for debugging purposes. # xcrun simctl spawn booted log stream --predicate 'eventMessage contains "flutter"' & - flutter test integration_test/e2e_test.dart -d "$SIMULATOR" --dart-define=CI=true + flutter test integration_test/e2e_test.dart -d "$SIMULATOR" --dart-define=CI=true ${{ contains(matrix.working_directory, 'cloud_firestore') && '--ignore-timeouts' || '' }} From 95bb9d7c902d8aa7c04785e9a50ba7265cb61f4b Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Mon, 11 Aug 2025 09:12:58 +0000 Subject: [PATCH 5/7] chore: apply --ignore-timeouts to all iOS e2e tests --- .github/workflows/ios.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ios.yaml b/.github/workflows/ios.yaml index 8e734e3ab448..80d627a7e827 100644 --- a/.github/workflows/ios.yaml +++ b/.github/workflows/ios.yaml @@ -115,4 +115,4 @@ jobs: run: | # Uncomment following line to have simulator logs printed out for debugging purposes. # xcrun simctl spawn booted log stream --predicate 'eventMessage contains "flutter"' & - flutter test integration_test/e2e_test.dart -d "$SIMULATOR" --dart-define=CI=true ${{ contains(matrix.working_directory, 'cloud_firestore') && '--ignore-timeouts' || '' }} + flutter test integration_test/e2e_test.dart -d "$SIMULATOR" --ignore-timeouts --dart-define=CI=true From 8b0b31d416a5c30ddcc0a52dac5d244669b3bb0f Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Mon, 11 Aug 2025 09:57:23 +0000 Subject: [PATCH 6/7] chore: apply --ignore-timeouts to android and macos e2e tests --- .github/workflows/android.yaml | 2 +- .github/workflows/macos.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml index 67712ac87d7f..bbdf0079151b 100644 --- a/.github/workflows/android.yaml +++ b/.github/workflows/android.yaml @@ -89,7 +89,7 @@ jobs: arch: x86_64 working-directory: ${{ matrix.working_directory }} script: | - flutter test integration_test/e2e_test.dart --dart-define=CI=true -d emulator-5554 + flutter test integration_test/e2e_test.dart --ignore-timeouts --dart-define=CI=true -d emulator-5554 - name: Ensure Appium is shut down # Required because of below issue where emulator failing to shut down properly causes tests to fail # https://github.com/ReactiveCircus/android-emulator-runner/issues/385 diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml index fc2e142e6032..5ebc40d2db15 100644 --- a/.github/workflows/macos.yaml +++ b/.github/workflows/macos.yaml @@ -85,7 +85,7 @@ jobs: export CCACHE_DEPEND=true export CCACHE_INODECACHE=true ccache -s - flutter build macos --debug --target=./integration_test/e2e_test.dart --device-id=macos --dart-define=CI=true + flutter build macos --debug --target=./integration_test/e2e_test.dart --device-id=macos --ignore-timeouts --dart-define=CI=true ccache -s - name: Start Firebase Emulator # Chown the npm cache directory to the runner user to avoid permission issues From c20e2767036f55c5a272a614f529feeadea2ad76 Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Mon, 11 Aug 2025 10:55:20 +0000 Subject: [PATCH 7/7] chore: fix macos ci --- .github/workflows/macos.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml index 5ebc40d2db15..4c4e8a6ba03f 100644 --- a/.github/workflows/macos.yaml +++ b/.github/workflows/macos.yaml @@ -85,7 +85,7 @@ jobs: export CCACHE_DEPEND=true export CCACHE_INODECACHE=true ccache -s - flutter build macos --debug --target=./integration_test/e2e_test.dart --device-id=macos --ignore-timeouts --dart-define=CI=true + flutter build macos --debug --target=./integration_test/e2e_test.dart --device-id=macos --dart-define=CI=true ccache -s - name: Start Firebase Emulator # Chown the npm cache directory to the runner user to avoid permission issues @@ -96,4 +96,5 @@ jobs: flutter test \ integration_test/e2e_test.dart \ -d macos \ - --dart-define=CI=true + --dart-define=CI=true \ + --ignore-timeouts