Merge remote-tracking branch 'upstream/main' into 1976523

Author: Sangie50

.github/workflows/check-beta-l10n.yml

@@ -2,7 +2,7 @@ name: Check new beta version - L10N
 
 on:
   schedule:
-    - cron: "40 */1 * * *"
+    - cron: "21 */1 * * *"
 env:
   LATEST: ""
 permissions:

.github/workflows/check-beta.yml

@@ -47,4 +47,4 @@ jobs:
     uses: ./.github/workflows/smoke.yml
     with:
       job_to_run: Smoke-MacOS
-    secrets: inherit
+    secrets: inherit

.github/workflows/ci-dispatch.yml

@@ -0,0 +1,68 @@
+---
+name: DTE Automation Dispatch
+
+run-name: CI tests kicked off by ${{ github.actor }}
+on:
+  pull_request:
+permissions:
+  contents: "write"
+
+jobs:
+  Select-Channels:
+    runs-on: ubuntu-latest
+    outputs:
+      channels: ${{ steps.dispatch.outputs.channels }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Select test channels
+        id: dispatch
+        run: |
+          python3 choose_test_channel.py
+          echo channels=$(python3 choose_test_channel.py) >> "$GITHUB_OUTPUT"
+
+
+  Run-Smoke-Win:
+    needs: Select-Channels
+    if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'smoke')
+    uses: ./.github/workflows/smoke.yml
+    with:
+      job_to_run: Smoke-Windows
+      is_pull_request: true
+    secrets: inherit
+
+  Run-Smoke-Mac:
+    needs: Select-Channels
+    if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'smoke')
+    uses: ./.github/workflows/smoke.yml
+    with:
+      job_to_run: Smoke-MacOS
+      is_pull_request: true
+    secrets: inherit
+
+  Run-L10n-Win:
+    needs: Select-Channels
+    if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'l10n')
+    uses: ./.github/workflows/l10n.yml
+    with:
+      job_to_run: L10n-Windows
+      is_pull_request: true
+    secrets: inherit
+
+  Run-L10n-Mac:
+    needs: Select-Channels
+    if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'l10n')
+    uses: ./.github/workflows/l10n.yml
+    with:
+      job_to_run: L10n-MacOS
+      is_pull_request: true
+    secrets: inherit
+
+  Run-L10n-Linux:
+    needs: Select-Channels
+    if: contains(fromJSON(needs.Select-Channels.outputs.channels), 'l10n')
+    uses: ./.github/workflows/l10n.yml
+    with:
+      job_to_run: L10n-Linux
+      is_pull_request: true
+    secrets: inherit

.github/workflows/l10n-write-mappings.yml

@@ -0,0 +1,31 @@
+---
+name: L10N output mapping splits
+
+run-name: ${{ github.actor }} is writing L10N mapping splits
+on:
+  schedule:
+    - cron: "0 0 * * 1"
+
+permissions:
+  contents: "write"
+
+jobs:
+  Select-Channels:
+    runs-on: ubuntu-latest
+    outputs:
+      channels: ${{ steps.splits.outputs.channels }}
+    steps:
+      - name: Create app token
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.BOT_CLIENT_ID }}
+          private-key: ${{ secrets.BOT_PRIVATE_KEY }}
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+      - name: Select test channels
+        id: splits
+        run: |
+          python3 choose_l10n_beta_split.py

.github/workflows/l10n.yml

@@ -3,7 +3,6 @@ name: L10N Test Execution
 
 run-name: ${{ github.actor }} is running l10n tests
 on:
-  pull_request:
   workflow_call:
     inputs:
       channel:
@@ -14,6 +13,10 @@ on:
       job_to_run:
         required: true
         type: string
+      is_pull_request:
+        description: "Is this a PR?"
+        default: false
+        type: boolean
   workflow_dispatch:
     inputs:
       win_installer_link:
@@ -38,25 +41,17 @@ env:
 
 jobs:
   L10N-MacOS:
-    if: ${{ inputs.job_to_run == 'L10N-MacOS' || github.event_name == 'pull_request' || inputs.mac_installer_link }}
+    if: ${{ inputs.job_to_run == 'L10N-MacOS' || inputs.mac_installer_link }}
     runs-on: macos-latest
     steps:
-      - name: Create app token
-        uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.BOT_CLIENT_ID }}
-          private-key: ${{ secrets.BOT_PRIVATE_KEY }}
       - name: Checkout repository
         uses: actions/checkout@v4
-        with:
-          token: ${{ steps.app-token.outputs.token }}
       - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:
           python-version: "3.11"
       - name: Set Environment (Scheduled Beta)
-        if: ${{ inputs.job_to_run == 'L10N-MacOS' }}
+        if: ${{ inputs.job_to_run == 'L10N-MacOS' && inputs.is_pull_request == false }}
         run: |
           echo "TESTRAIL_REPORT='true'" >> "$GITHUB_ENV";
           echo "Running report for most recent Beta on MacOS";
@@ -97,51 +92,24 @@ jobs:
             exit $EXIT_CODE;
           fi
           exit $SCRIPT_EXIT_CODE;
-      - name: Run L10N Tests in MacOS (Headed)
-        if: steps.setup.conclusion == 'success' && always()
-        env:
-          FX_EXECUTABLE: /Volumes/${{ steps.setup.outputs.app_name }}/${{ steps.setup.outputs.app_name }}.app/Contents/MacOS/firefox
-          REPORTABLE: ${{ env.TESTRAIL_REPORT == 'true' }}
-        run: |
-          mv ./ci_l10n_pyproject_headed.toml ./pyproject.toml;
-          echo "0" > TEST_EXIT_CODE;
-          while IFS= read -r line; do
-            echo "Running tests for: $line";
-            pipenv run python -m l10n_CM.run_l10n --fx-executable="$FX_EXECUTABLE" $line || SCRIPT_EXIT_CODE=$?;
-          done < selected_l10n_mappings;
-          ls artifacts-mac/* &>/dev/null || echo "No mappings to report" >> artifacts-mac/placeholder.txt
-          mv -n artifacts/* artifacts-mac/ || true;
-          EXIT_CODE=$(cat TEST_EXIT_CODE);
-          if [ $EXIT_CODE != 0 ]; then
-            exit $EXIT_CODE;
-          fi
-          exit $SCRIPT_EXIT_CODE;
       - name: Upload artifacts
         if: ${{ always() && github.event_name == 'pull_request' }}
         uses: actions/upload-artifact@v4
         with:
           name: artifacts-mac
           path: artifacts-mac
   L10N-Linux:
-    if: ${{ inputs.job_to_run == 'L10N-Linux' || github.event_name == 'pull_request' || inputs.linux_tarball_link }}
+    if: ${{ inputs.job_to_run == 'L10N-Linux' || inputs.linux_tarball_link }}
     runs-on: ubuntu-latest
     steps:
-      - name: Create app token
-        uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.BOT_CLIENT_ID }}
-          private-key: ${{ secrets.BOT_PRIVATE_KEY }}
       - name: Checkout repository
         uses: actions/checkout@v4
-        with:
-          token: ${{ steps.app-token.outputs.token }}
       - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:
           python-version: "3.11"
       - name: Set Environment (Scheduled Beta)
-        if: ${{ inputs.job_to_run == 'L10N-Linux' }}
+        if: ${{ inputs.job_to_run == 'L10N-Linux' && inputs.is_pull_request == false }}
         run: |
           echo "TESTRAIL_REPORT='true'" >> "$GITHUB_ENV";
           echo "Running report for most recent Beta on Linux";
@@ -180,45 +148,18 @@ jobs:
             exit $EXIT_CODE;
           fi
           exit $SCRIPT_EXIT_CODE;
-      - name: Run Smoke Tests in Ubuntu (Headed)
-        if: steps.setup.conclusion == 'success' && always()
-        env:
-          REPORTABLE: ${{ env.TESTRAIL_REPORT == 'true' }}
-          FX_EXECUTABLE: ./firefox/firefox
-        run: |
-          mv ./ci_l10n_pyproject_headed.toml ./pyproject.toml;
-          echo "0" > TEST_EXIT_CODE;
-          while IFS= read -r line; do
-            echo "Running tests for: $line";
-            DISPLAY=:99 pipenv run python -m l10n_CM.run_l10n --fx-executable="$FX_EXECUTABLE" $line || SCRIPT_EXIT_CODE=$?;
-          done < selected_l10n_mappings;
-          ls artifacts-linux/* &>/dev/null || echo "No mappings to report" >> artifacts-linux/placeholder.txt
-          mv -n artifacts/* artifacts-linux/ || true;
-          EXIT_CODE=$(cat TEST_EXIT_CODE);
-          if [ $EXIT_CODE != 0 ]; then
-            exit $EXIT_CODE;
-          fi
-          exit $SCRIPT_EXIT_CODE;
       - name: Upload artifacts
-        if: ${{ always() && github.event_name == 'pull_request' }}
+        if: ${{ always() && inputs.is_pull_request == true }}
         uses: actions/upload-artifact@v4
         with:
           name: artifacts-linux
           path: artifacts-linux
   L10N-Windows:
-    if: ${{ inputs.job_to_run == 'L10N-Windows' || github.event_name == 'pull_request' || inputs.win_installer_link }}
+    if: ${{ inputs.job_to_run == 'L10N-Windows' || inputs.win_installer_link }}
     runs-on: windows-latest
     steps:
-      - name: Create app token
-        uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.BOT_CLIENT_ID }}
-          private-key: ${{ secrets.BOT_PRIVATE_KEY }}
       - name: Checkout repository
         uses: actions/checkout@v4
-        with:
-          token: ${{ steps.app-token.outputs.token }}
       - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:
@@ -232,7 +173,7 @@ jobs:
           New-item -Name .env -Value $env_contents -ItemType File -Force
           Write-Host "Running l10n tests on supplied executable"
       - name: Set Environment (Scheduled Beta)
-        if: ${{ inputs.job_to_run == 'L10N-Windows' }}
+        if: ${{ inputs.job_to_run == 'L10N-Windows' && inputs.is_pull_request == false}}
         run: |
           $env_contents = @"
           TESTRAIL_REPORT='true'
@@ -298,49 +239,8 @@ jobs:
               exit [int]$EXIT_CODE
           }
           exit $env:SCRIPT_EXIT_CODE
-      - name: Run L10N Tests in Win (Headed)
-        if: steps.setup.conclusion == 'success' && always()
-        env:
-          REPORTABLE: ${{ env.TESTRAIL_REPORT == 'true' }}
-        run: |
-          rm ./pyproject.toml;
-          mv ./ci_l10n_pyproject_headed.toml ./pyproject.toml;
-          $env:FX_EXECUTABLE = 'C:\Program Files\Custom Firefox\firefox.exe'
-          Write-Host "FX_EXECUTABLE: $FX_EXECUTABLE"
-          pipenv run python choose_l10n_ci_set.py
-          "0" | Set-Content -Path "TEST_EXIT_CODE"
-          $SCRIPT_EXIT_CODE = 0
-          Get-Content "selected_l10n_mappings" | ForEach-Object {
-              $line = $_
-              Write-Host "Running tests for: $line"
-              try {
-                  pipenv run python -m l10n_CM.run_l10n --fx-executable="$env:FX_EXECUTABLE" $line
-              } catch {
-                  $SCRIPT_EXIT_CODE = $_.Exception.HResult
-              }
-          }
-          rm artifacts/assets -r -Force -ErrorAction SilentlyContinue
-          Get-ChildItem -Path "artifacts" -ErrorAction SilentlyContinue | ForEach-Object {
-              $destPath = "artifacts-win\" + $_.Name
-              if (-not (Test-Path -Path $destPath)) {
-                  try {
-                      Move-Item -Path $_.FullName -Destination $destPath
-                  } catch {
-                      # Ignore errors and continue
-                  }
-              }
-          }
-          mkdir artifacts-win -Force
-          if (-not (Test-Path -Path "artifacts-win\*")) {
-            New-Item -Path "artifacts-win\placeholder.txt" -ItemType File -Value "no mappings to report."
-          }
-          $EXIT_CODE = Get-Content -Path "TEST_EXIT_CODE"
-          if ($EXIT_CODE -ne 0) {
-              exit [int]$EXIT_CODE
-          }
-          exit $env:SCRIPT_EXIT_CODE
       - name: Upload artifacts
-        if: ${{ always() && github.event_name == 'pull_request' }}
+        if: ${{ always() && inputs.is_pull_request == true }}
         uses: actions/upload-artifact@v4
         with:
           name: artifacts-win
@@ -367,17 +267,17 @@ jobs:
       - name: Download Windows artifact
         uses: actions/download-artifact@v4
         with:
-          name: artifacts-win
+          name: artifacts-win-l10n
           path: artifacts-win
       - name: Download Linux artifact
         uses: actions/download-artifact@v4
         with:
-          name: artifacts-linux
+          name: artifacts-linux-l10n
           path: artifacts-linux
       - name: Download MacOS artifact
         uses: actions/download-artifact@v4
         with:
-          name: artifacts-mac
+          name: artifacts-mac-l10n
           path: artifacts-mac
       - name: List downloaded Windows files
         run: ls artifacts-win/