From 022f2238f210d293a5d91fa017ccec02ace08dfb Mon Sep 17 00:00:00 2001 From: "drsanta@google.com" Date: Fri, 20 May 2022 09:24:41 -0400 Subject: [PATCH 1/3] configure java version for running desktop tests --- .github/workflows/desktop.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index 11176ae44e..6538dc5184 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -362,6 +362,10 @@ jobs: run: | npm install -g firebase-tools - name: Run Desktop integration tests + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' run: | cp scripts/gha/integration_testing/google-services.json testapps-desktop-ubuntu-latest-openssl/firestore/google-services.json firebase emulators:exec --only firestore --project demo-example 'python scripts/gha/desktop_tester.py --testapp_dir testapps-desktop-ubuntu-latest-openssl --logfile_name "desktop-ubuntu-latest-openssl"' From 34c859d231f4c383a4d969b54c38cd7efca084c2 Mon Sep 17 00:00:00 2001 From: "drsanta@google.com" Date: Fri, 20 May 2022 09:29:09 -0400 Subject: [PATCH 2/3] setup java in its own step --- .github/workflows/desktop.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index 6538dc5184..582126bc4e 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -361,11 +361,12 @@ jobs: - name: Setup Firestore Emulator run: | npm install -g firebase-tools - - name: Run Desktop integration tests + - name: Setup java uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: '17' + - name: Run Desktop integration tests run: | cp scripts/gha/integration_testing/google-services.json testapps-desktop-ubuntu-latest-openssl/firestore/google-services.json firebase emulators:exec --only firestore --project demo-example 'python scripts/gha/desktop_tester.py --testapp_dir testapps-desktop-ubuntu-latest-openssl --logfile_name "desktop-ubuntu-latest-openssl"' From e479b5dfc25177e998ea6f0d9d39031cf1d6edad Mon Sep 17 00:00:00 2001 From: "drsanta@google.com" Date: Fri, 20 May 2022 10:29:01 -0400 Subject: [PATCH 3/3] configure java on desktop integration tests --- .github/workflows/integration_tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 67189598b5..83c00e4ae3 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -893,6 +893,11 @@ jobs: command: | pip install -r scripts/gha/requirements.txt python scripts/gha/restore_secrets.py --passphrase "${{ secrets.TEST_SECRET }}" --artifact "testapps/testapps-desktop-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}" + - name: Setup java + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: '17' - name: Run Desktop integration tests env: USE_FIRESTORE_EMULATOR: true