From d70566571b8dca86eef07f27e164d58cca08fee5 Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Fri, 12 Dec 2025 10:15:50 +0000 Subject: [PATCH 1/2] ci: upgrade emulator workflows to JDK 21 --- .github/workflows/android.yaml | 2 +- .github/workflows/e2e_tests_fdc.yaml | 6 +++--- .github/workflows/ios.yaml | 2 +- .github/workflows/macos.yaml | 2 +- .github/workflows/web.yaml | 6 +++--- .github/workflows/windows.yaml | 5 ++--- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml index 5b6eb2555dc0..e264babdfdcb 100644 --- a/.github/workflows/android.yaml +++ b/.github/workflows/android.yaml @@ -42,7 +42,7 @@ jobs: - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Firebase Emulator Cache uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: diff --git a/.github/workflows/e2e_tests_fdc.yaml b/.github/workflows/e2e_tests_fdc.yaml index d252f8fed582..fb0a4c4a69de 100644 --- a/.github/workflows/e2e_tests_fdc.yaml +++ b/.github/workflows/e2e_tests_fdc.yaml @@ -36,7 +36,7 @@ jobs: - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Firebase Emulator Cache uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: @@ -113,7 +113,7 @@ jobs: - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Setup PostgreSQL for Linux/macOS/Windows uses: ikalnytskyi/action-setup-postgres@v7 - uses: hendrikmuhs/ccache-action@c92f40bee50034e84c763e33b317c77adaa81c92 @@ -193,7 +193,7 @@ jobs: - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Setup PostgreSQL for Linux/macOS/Windows uses: ikalnytskyi/action-setup-postgres@v7 - uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff diff --git a/.github/workflows/ios.yaml b/.github/workflows/ios.yaml index 28865c50d745..7d09bae5f60f 100644 --- a/.github/workflows/ios.yaml +++ b/.github/workflows/ios.yaml @@ -44,7 +44,7 @@ jobs: - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: distribution: 'temurin' - java-version: '17' + java-version: '21' - uses: hendrikmuhs/ccache-action@c92f40bee50034e84c763e33b317c77adaa81c92 name: Xcode Compile Cache with: diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml index 4c4e8a6ba03f..6cafa6526844 100644 --- a/.github/workflows/macos.yaml +++ b/.github/workflows/macos.yaml @@ -42,7 +42,7 @@ jobs: - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: distribution: 'temurin' - java-version: '17' + java-version: '21' - uses: hendrikmuhs/ccache-action@c92f40bee50034e84c763e33b317c77adaa81c92 name: Xcode Compile Cache with: diff --git a/.github/workflows/web.yaml b/.github/workflows/web.yaml index 3866161422f6..368d45a33576 100644 --- a/.github/workflows/web.yaml +++ b/.github/workflows/web.yaml @@ -42,7 +42,7 @@ jobs: - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: distribution: 'temurin' - java-version: '17' + java-version: '21' - uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff with: channel: 'stable' @@ -94,7 +94,7 @@ jobs: - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: distribution: 'temurin' - java-version: '17' + java-version: '21' - uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff with: channel: 'stable' @@ -151,7 +151,7 @@ jobs: - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: distribution: 'temurin' - java-version: '17' + java-version: '21' - uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff with: channel: 'stable' diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 2b13d0a75dd0..01c2ece1fb06 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -33,7 +33,7 @@ jobs: - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: distribution: 'temurin' - java-version: '17' + java-version: '21' - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a name: Install Node.js 20 with: @@ -65,7 +65,7 @@ jobs: - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b with: distribution: 'temurin' - java-version: '17' + java-version: '21' - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a name: Install Node.js 20 with: @@ -87,4 +87,3 @@ jobs: npm install -g firebase-tools - name: Start Firebase Emulator and run tests run: cd ./.github/workflows/scripts && firebase emulators:exec --project flutterfire-e2e-tests "cd ../../../packages/cloud_firestore/cloud_firestore/example && flutter build windows" - From 60582db48e71d64176ac66f35ef3f809e909f3ea Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Mon, 15 Dec 2025 08:02:33 +0000 Subject: [PATCH 2/2] ci: add emulator build version to Android and FDC workflows --- .github/workflows/android.yaml | 1 + .github/workflows/e2e_tests_fdc.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml index e264babdfdcb..6b57c132b784 100644 --- a/.github/workflows/android.yaml +++ b/.github/workflows/android.yaml @@ -95,6 +95,7 @@ jobs: api-level: 34 target: google_apis arch: x86_64 + emulator-build: 14214601 working-directory: ${{ matrix.working_directory }} script: | flutter test integration_test/e2e_test.dart --ignore-timeouts --dart-define=CI=true -d emulator-5554 diff --git a/.github/workflows/e2e_tests_fdc.yaml b/.github/workflows/e2e_tests_fdc.yaml index fb0a4c4a69de..720537dbee0b 100644 --- a/.github/workflows/e2e_tests_fdc.yaml +++ b/.github/workflows/e2e_tests_fdc.yaml @@ -93,6 +93,7 @@ jobs: api-level: 34 target: google_apis arch: x86_64 + emulator-build: 14214601 working-directory: 'packages/firebase_data_connect/firebase_data_connect/example' script: | flutter test integration_test/e2e_test.dart --dart-define=CI=true -d emulator-5554