Switch to matrix for multi browser tests.

mozilla · Apr 10, 2024 · 8969ef2 · 8969ef2
1 parent afb5ab4
commit 8969ef2
Showing 1 changed file with 28 additions and 67 deletions.
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
@@ -16,72 +16,33 @@ on:
 env:
   MOZ_HEADLESS: 1
 jobs:
-  windows-klaatu-firefox-release:
+  klaatu-tests:
     runs-on: windows-latest
+    strategy:
+      matrix:
+        firefox: ['latest-beta', 'latest-nightly', 'latest' ]
+    name: windows-klaatu-firefox${{ matrix.firefox }}
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-    - name: Setup Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.11'
-    - name: Install Chocolatey
-      shell: pwsh
-      run: Set-ExecutionPolicy Bypass -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
-    - name: Install Dependencies
-      shell: pwsh
-      run: choco install jdk8 selenium-gecko-driver selenium 
-    - name: Install Firefox Release
-      shell: pwsh
-      run: choco install firefox
-    - name: Setup tests
-      shell: bash
-      run: ./setup_script.sh
-    - name: Run Tests
-      run: tox -e bdd-tests -- --experiment-branch ${{ inputs.branch }} --experiment-slug ${{ inputs.slug }} --private-browsing-enabled
-  windows-klaatu-firefox-beta:
-    runs-on: windows-latest
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-    - name: Setup Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.11'
-    - name: Install Chocolatey
-      shell: pwsh
-      run: Set-ExecutionPolicy Bypass -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
-    - name: Install Dependencies
-      shell: pwsh
-      run: choco install jdk8 selenium-gecko-driver selenium 
-    - name: Install Firefox Beta
-      shell: pwsh
-      run: choco install firefox-dev --pre 
-    - name: Setup tests
-      shell: bash
-      run: ./setup_script.sh
-    - name: Run Tests
-      run: tox -e bdd-tests -- --experiment-branch ${{ inputs.branch }} --experiment-slug ${{ inputs.slug }} --private-browsing-enabled
-  windows-klaatu-firefox-nightly:
-    runs-on: windows-latest
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-    - name: Setup Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.11'
-    - name: Install Chocolatey
-      shell: pwsh
-      run: Set-ExecutionPolicy Bypass -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
-    - name: Install Dependencies
-      shell: pwsh
-      run: choco install jdk8 selenium-gecko-driver selenium 
-    - name: Install Firefox Nightly
-      shell: pwsh
-      run: choco install firefox-nightly --pre
-    - name: Setup tests
-      shell: bash
-      run: ./setup_script.sh
-    - name: Run Tests
-      run: tox -e bdd-tests -- --experiment-branch ${{ inputs.branch }} --experiment-slug ${{ inputs.slug }} --private-browsing-enabled --run-update-test
+      - name: Setup firefox
+        id: setup-firefox
+        uses: browser-actions/setup-firefox@v1
+        with:
+          firefox-version: ${{ matrix.firefox }}
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+      - uses: browser-actions/setup-geckodriver@latest
+      - name: Install Chocolatey
+        shell: pwsh
+        run: Set-ExecutionPolicy Bypass -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
+      - name: Install Dependencies
+        shell: pwsh
+        run: choco install jdk8 selenium 
+      - name: Setup tests
+        shell: bash
+        run: ./setup_script.sh
+      - name: Run Tests
+        run: tox -e bdd-tests -- --experiment-branch ${{ inputs.branch }} --experiment-slug ${{ inputs.slug }} --private-browsing-enabled