From 2312d476f2a4736a117a7fc60cb19a4794dcfdd1 Mon Sep 17 00:00:00 2001 From: Christina Holland Date: Mon, 9 Dec 2024 14:20:19 -0800 Subject: [PATCH 1/7] Run firefox tests on ubuntu-latest to see if they work --- .github/workflows/test-changed-auth.yml | 5 +---- .github/workflows/test-changed-firestore.yml | 10 ++-------- .github/workflows/test-changed.yml | 5 +---- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/test-changed-auth.yml b/.github/workflows/test-changed-auth.yml index f94d058fb04..ce36960c2c0 100644 --- a/.github/workflows/test-changed-auth.yml +++ b/.github/workflows/test-changed-auth.yml @@ -70,11 +70,8 @@ jobs: run: xvfb-run yarn test:changed auth test-firefox: name: Test Auth on Firefox If Changed - # Whatever version of Firefox comes with 22.04 is causing Firefox - # startup to hang when launched by karma. Need to look further into - # why. - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: install Firefox stable diff --git a/.github/workflows/test-changed-firestore.yml b/.github/workflows/test-changed-firestore.yml index 7a181702d35..9e1bfbf431c 100644 --- a/.github/workflows/test-changed-firestore.yml +++ b/.github/workflows/test-changed-firestore.yml @@ -169,10 +169,7 @@ jobs: compat-test-firefox: name: Test Firestore Compatible on Firefox - # Whatever version of Firefox comes with 22.04 is causing Firefox - # startup to hang when launched by karma. Need to look further into - # why. - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest needs: build if: ${{ needs.build.outputs.changed == 'true'}} steps: @@ -202,10 +199,7 @@ jobs: strategy: matrix: test-name: ["test:browser", "test:travis", "test:lite:browser", "test:browser:prod:nameddb", "test:lite:browser:nameddb"] - # Whatever version of Firefox comes with 22.04 is causing Firefox - # startup to hang when launched by karma. Need to look further into - # why. - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest needs: build if: ${{ needs.build.outputs.changed == 'true'}} steps: diff --git a/.github/workflows/test-changed.yml b/.github/workflows/test-changed.yml index 6499a825725..dd3718de2bb 100644 --- a/.github/workflows/test-changed.yml +++ b/.github/workflows/test-changed.yml @@ -50,10 +50,7 @@ jobs: test-firefox: name: Test Packages With Changed Files in Firefox - # Whatever version of Firefox comes with 22.04 is causing Firefox - # startup to hang when launched by karma. Need to look further into - # why. - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Checkout Repo From 766ef28ee3bfd6a3b0b50989b9bdb02e21f867c0 Mon Sep 17 00:00:00 2001 From: Christina Holland Date: Mon, 9 Dec 2024 14:24:21 -0800 Subject: [PATCH 2/7] add comment to trigger CI --- config/karma.base.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/karma.base.js b/config/karma.base.js index 49824296740..b074644711f 100644 --- a/config/karma.base.js +++ b/config/karma.base.js @@ -118,3 +118,5 @@ config.mochaReporter = { }; module.exports = config; + +// FIXME: trigger all CI tests From 6bfe32331def99fb562226325fa8e5115660b06d Mon Sep 17 00:00:00 2001 From: Christina Holland Date: Tue, 10 Dec 2024 10:53:54 -0800 Subject: [PATCH 3/7] Try unsetting snap env vars --- .github/workflows/test-changed-auth.yml | 2 ++ .github/workflows/test-changed-firestore.yml | 4 ++++ .github/workflows/test-changed.yml | 2 ++ 3 files changed, 8 insertions(+) diff --git a/.github/workflows/test-changed-auth.yml b/.github/workflows/test-changed-auth.yml index ce36960c2c0..1ac9a4e3202 100644 --- a/.github/workflows/test-changed-auth.yml +++ b/.github/workflows/test-changed-auth.yml @@ -99,6 +99,8 @@ jobs: run: xvfb-run yarn test:changed auth env: BROWSERS: 'Firefox' + SNAP_NAME: '' + SNAP_INSTANCE_NAME: '' test-webkit: name: Test Auth on Webkit if Changed diff --git a/.github/workflows/test-changed-firestore.yml b/.github/workflows/test-changed-firestore.yml index 9e1bfbf431c..1e459d24d98 100644 --- a/.github/workflows/test-changed-firestore.yml +++ b/.github/workflows/test-changed-firestore.yml @@ -193,6 +193,8 @@ jobs: run: cd packages/firestore-compat && xvfb-run yarn run test:ci env: BROWSERS: 'Firefox' + SNAP_NAME: '' + SNAP_INSTANCE_NAME: '' test-firefox: name: Test Firestore on Firefox @@ -224,6 +226,8 @@ jobs: env: BROWSERS: 'Firefox' EXPERIMENTAL_MODE: true + SNAP_NAME: '' + SNAP_INSTANCE_NAME: '' compat-test-webkit: name: Test Firestore Compatible on Webkit diff --git a/.github/workflows/test-changed.yml b/.github/workflows/test-changed.yml index dd3718de2bb..6aee6458d76 100644 --- a/.github/workflows/test-changed.yml +++ b/.github/workflows/test-changed.yml @@ -75,6 +75,8 @@ jobs: run: xvfb-run yarn test:changed core env: BROWSERS: 'Firefox' + SNAP_NAME: '' + SNAP_INSTANCE_NAME: '' test-webkit: From 896c8ad354a9119b7ef11118e3548049af4d9658 Mon Sep 17 00:00:00 2001 From: Christina Holland Date: Wed, 11 Dec 2024 08:39:08 -0800 Subject: [PATCH 4/7] Try some options --- .github/workflows/test-changed-auth.yml | 6 +----- .github/workflows/test-changed-firestore.yml | 8 ++------ .github/workflows/test-changed.yml | 4 +--- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test-changed-auth.yml b/.github/workflows/test-changed-auth.yml index 1ac9a4e3202..57f1139db93 100644 --- a/.github/workflows/test-changed-auth.yml +++ b/.github/workflows/test-changed-auth.yml @@ -76,9 +76,7 @@ jobs: steps: - name: install Firefox stable run: | - sudo apt-get update - sudo apt-get install firefox - sudo apt-get install wget + npx @puppeteer/browsers install firefox@stable - name: Checkout Repo uses: actions/checkout@v4 @@ -99,8 +97,6 @@ jobs: run: xvfb-run yarn test:changed auth env: BROWSERS: 'Firefox' - SNAP_NAME: '' - SNAP_INSTANCE_NAME: '' test-webkit: name: Test Auth on Webkit if Changed diff --git a/.github/workflows/test-changed-firestore.yml b/.github/workflows/test-changed-firestore.yml index 1e459d24d98..8e6122254f9 100644 --- a/.github/workflows/test-changed-firestore.yml +++ b/.github/workflows/test-changed-firestore.yml @@ -169,7 +169,7 @@ jobs: compat-test-firefox: name: Test Firestore Compatible on Firefox - runs-on: ubuntu-latest + runs-on: windows-latest needs: build if: ${{ needs.build.outputs.changed == 'true'}} steps: @@ -193,15 +193,13 @@ jobs: run: cd packages/firestore-compat && xvfb-run yarn run test:ci env: BROWSERS: 'Firefox' - SNAP_NAME: '' - SNAP_INSTANCE_NAME: '' test-firefox: name: Test Firestore on Firefox strategy: matrix: test-name: ["test:browser", "test:travis", "test:lite:browser", "test:browser:prod:nameddb", "test:lite:browser:nameddb"] - runs-on: ubuntu-latest + runs-on: windows-latest needs: build if: ${{ needs.build.outputs.changed == 'true'}} steps: @@ -226,8 +224,6 @@ jobs: env: BROWSERS: 'Firefox' EXPERIMENTAL_MODE: true - SNAP_NAME: '' - SNAP_INSTANCE_NAME: '' compat-test-webkit: name: Test Firestore Compatible on Webkit diff --git a/.github/workflows/test-changed.yml b/.github/workflows/test-changed.yml index 6aee6458d76..17599944178 100644 --- a/.github/workflows/test-changed.yml +++ b/.github/workflows/test-changed.yml @@ -50,7 +50,7 @@ jobs: test-firefox: name: Test Packages With Changed Files in Firefox - runs-on: ubuntu-latest + runs-on: windows-latest steps: - name: Checkout Repo @@ -75,8 +75,6 @@ jobs: run: xvfb-run yarn test:changed core env: BROWSERS: 'Firefox' - SNAP_NAME: '' - SNAP_INSTANCE_NAME: '' test-webkit: From f42477a6e3aea712813db1121055e32b19f77380 Mon Sep 17 00:00:00 2001 From: Christina Holland Date: Wed, 11 Dec 2024 08:47:54 -0800 Subject: [PATCH 5/7] A/B test, no firefox install vs puppeteer --- .github/workflows/test-changed-firestore.yml | 15 +++++++-------- .github/workflows/test-changed.yml | 10 +++++----- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test-changed-firestore.yml b/.github/workflows/test-changed-firestore.yml index 8e6122254f9..57c58646821 100644 --- a/.github/workflows/test-changed-firestore.yml +++ b/.github/workflows/test-changed-firestore.yml @@ -169,14 +169,13 @@ jobs: compat-test-firefox: name: Test Firestore Compatible on Firefox - runs-on: windows-latest + runs-on: ubuntu-latest needs: build if: ${{ needs.build.outputs.changed == 'true'}} steps: - name: install Firefox stable run: | - sudo apt-get update - sudo apt-get install firefox + npx @puppeteer/browsers install firefox@stable - name: Set up Node (20) uses: actions/setup-node@v3 with: @@ -199,14 +198,14 @@ jobs: strategy: matrix: test-name: ["test:browser", "test:travis", "test:lite:browser", "test:browser:prod:nameddb", "test:lite:browser:nameddb"] - runs-on: windows-latest + runs-on: ubuntu-latest needs: build if: ${{ needs.build.outputs.changed == 'true'}} steps: - - name: install Firefox stable - run: | - sudo apt-get update - sudo apt-get install firefox + # - name: install Firefox stable + # run: | + # sudo apt-get update + # sudo apt-get install firefox - name: Download build archive uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/test-changed.yml b/.github/workflows/test-changed.yml index 17599944178..2e8a70429d4 100644 --- a/.github/workflows/test-changed.yml +++ b/.github/workflows/test-changed.yml @@ -50,7 +50,7 @@ jobs: test-firefox: name: Test Packages With Changed Files in Firefox - runs-on: windows-latest + runs-on: ubuntu-latest steps: - name: Checkout Repo @@ -61,10 +61,10 @@ jobs: uses: actions/setup-node@v3 with: node-version: 22.10.0 - - name: install Firefox stable - run: | - sudo apt-get update - sudo apt-get install firefox + # - name: install Firefox stable + # run: | + # sudo apt-get update + # sudo apt-get install firefox - name: Test setup and yarn install run: | cp config/ci.config.json config/project.json From ec0814657aaae81fb10a96f51c5463420c78f70d Mon Sep 17 00:00:00 2001 From: Christina Holland Date: Wed, 11 Dec 2024 09:10:40 -0800 Subject: [PATCH 6/7] Use puppeteer for all Firefox installs --- .github/workflows/test-changed-auth.yml | 4 +--- .github/workflows/test-changed-firestore.yml | 9 +++------ .github/workflows/test-changed.yml | 6 ++---- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test-changed-auth.yml b/.github/workflows/test-changed-auth.yml index 57f1139db93..e88ce3b7a52 100644 --- a/.github/workflows/test-changed-auth.yml +++ b/.github/workflows/test-changed-auth.yml @@ -75,9 +75,7 @@ jobs: steps: - name: install Firefox stable - run: | - npx @puppeteer/browsers install firefox@stable - + run: npx @puppeteer/browsers install firefox@stable - name: Checkout Repo uses: actions/checkout@v4 with: diff --git a/.github/workflows/test-changed-firestore.yml b/.github/workflows/test-changed-firestore.yml index 57c58646821..259e9164d7f 100644 --- a/.github/workflows/test-changed-firestore.yml +++ b/.github/workflows/test-changed-firestore.yml @@ -174,8 +174,7 @@ jobs: if: ${{ needs.build.outputs.changed == 'true'}} steps: - name: install Firefox stable - run: | - npx @puppeteer/browsers install firefox@stable + run: npx @puppeteer/browsers install firefox@stable - name: Set up Node (20) uses: actions/setup-node@v3 with: @@ -202,10 +201,8 @@ jobs: needs: build if: ${{ needs.build.outputs.changed == 'true'}} steps: - # - name: install Firefox stable - # run: | - # sudo apt-get update - # sudo apt-get install firefox + - name: install Firefox stable + run: npx @puppeteer/browsers install firefox@stable - name: Download build archive uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/test-changed.yml b/.github/workflows/test-changed.yml index 2e8a70429d4..7dc0ef60a37 100644 --- a/.github/workflows/test-changed.yml +++ b/.github/workflows/test-changed.yml @@ -61,10 +61,8 @@ jobs: uses: actions/setup-node@v3 with: node-version: 22.10.0 - # - name: install Firefox stable - # run: | - # sudo apt-get update - # sudo apt-get install firefox + - name: install Firefox stable + run: npx @puppeteer/browsers install firefox@stable - name: Test setup and yarn install run: | cp config/ci.config.json config/project.json From 4115828611043b0a66d74dd1ee5dc96392b756e2 Mon Sep 17 00:00:00 2001 From: Christina Holland Date: Wed, 11 Dec 2024 09:53:54 -0800 Subject: [PATCH 7/7] remove FIXME --- config/karma.base.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/karma.base.js b/config/karma.base.js index b074644711f..49824296740 100644 --- a/config/karma.base.js +++ b/config/karma.base.js @@ -118,5 +118,3 @@ config.mochaReporter = { }; module.exports = config; - -// FIXME: trigger all CI tests