Tests force-pushes being closed by Oppiabot.

.gcloudignore

@@ -119,8 +119,8 @@ third_party/static/ckeditor-bootstrapck-1.0.0/skins/ckbuilder.jar/
 third_party/static/ckeditor-bootstrapck-1.0.0/skins/bootstrapck/sample/
 third_party/static/ckeditor-bootstrapck-1.0.0/skins/bootstrapck/scss/
 third_party/static/fontawesome-free-5.9.0-web/
-third_party/static/guppy-f509e1/site/
-third_party/static/guppy-f509e1/test/
+third_party/static/guppy-c1ef610/site/
+third_party/static/guppy-c1ef610/test/
 third_party/static/MathJax-2.7.5/docs/
 third_party/static/MathJax-2.7.5/fonts/HTML-CSS/Gyre-Pagella/
 third_party/static/MathJax-2.7.5/fonts/HTML-CSS/Gyre-Termes/

.github/CODEOWNERS

@@ -55,7 +55,6 @@
 /core/templates/modules/ @oppia/lace-frontend-reviewers
 /core/templates/pages/common-imports.ts @oppia/lace-frontend-reviewers
 /core/templates/pages/oppia-root/ @oppia/lace-frontend-reviewers
-/core/templates/pages/lightweight-oppia-root/ @oppia/lace-frontend-reviewers
 /core/templates/i18n/ @oppia/lace-frontend-reviewers
 /core/templates/services/contextual/logger.service.ts @oppia/lace-frontend-reviewers
 /core/templates/services/contextual/logger.service.spec.ts @oppia/lace-frontend-reviewers
@@ -93,7 +92,7 @@
 /core/templates/services/assets-backend-api.service*.ts @oppia/lace-frontend-reviewers
 /core/templates/services/entity-translations.services.ts @oppia/lace-frontend-reviewers
 /core/templates/services/entity-voiceovers.services.ts @oppia/lace-frontend-reviewers
-/core/templates/services/voiceover-regeneration-task-mapping-service.ts @oppia/lace-frontend-reviewers
+/core/templates/services/voiceover-regeneration-job-service.ts @oppia/lace-frontend-reviewers
 /core/templates/services/voiceover-language-management-service.ts @oppia/lace-frontend-reviewers
 /core/templates/services/automatic-voiceover-highlight-service.ts @oppia/lace-frontend-reviewers
 
@@ -304,6 +303,10 @@
 /core/templates/domain/promo_bar/ @oppia/lace-frontend-reviewers
 /core/templates/filters/ @oppia/lace-frontend-reviewers
 /core/templates/services/attribution.service*.ts @oppia/lace-frontend-reviewers
+/core/templates/components/campaign-banner/campaign-banner.component*.ts @oppia/lace-frontend-reviewers
+/core/templates/components/campaign-banner/campaign-banner.component.html @oppia/lace-frontend-reviewers
+/core/templates/components/campaign-banner/campaign-banner.component.css @oppia/lace-frontend-reviewers
+/core/templates/components/campaign-banner/campaign-banner-module.ts  @oppia/lace-frontend-reviewers
 
 
 # Global frontend services

.github/ISSUE_TEMPLATE/3_e2e_acceptance_error_template.yml

@@ -14,6 +14,19 @@ body:
         [this wiki page](https://github.com/oppia/oppia/wiki/If-CI-checks-fail-on-your-PR)
         and are filing this issue as part of the process described there.
         Thanks!
+  - type: checkboxes
+    id: read-procedure
+    attributes:
+      label: I have read the procedure
+      description: >
+        Please confirm that you have read the note above by selecting the option
+        that best describes your situation.
+      options:
+        - label: I reproduced the flake on the develop branch.
+        - label: I observed this flake directly on the develop branch.
+        - label: The changes in my PR are unrelated to the failure.
+    validations:
+      required: true
   - type: dropdown
     id: ci-test-type
     attributes:

.github/actions/generate-build-files/action.yml

@@ -3,55 +3,20 @@ description: 'Generate build files'
 runs:
   using: composite
   steps:
-    - name: Attempt to download build files
-      id: download_artifact
-      uses: actions/download-artifact@v4
-      continue-on-error: true
+    - name: Restore build files from cache
+      id: restore_build_files_cache
+      uses: actions/cache@v4
       with:
-        name: cached_build_files
-        path: /home/runner/work/oppia
-    - name: Unzip build files
-      if: steps.download_artifact.outcome != 'failure'
-      run: |
-        echo "Successfully downloaded build files"
-        pwd
-        ls -la
-        unzip build_files.zip
-        rm build_files.zip
-        echo "Files in ./:"
-        ls -la .
-        echo "Files in oppia_tools:"
-        ls -la oppia_tools
-        echo "Files in oppia:"
-        ls -la oppia
-        echo "Files in build:"
-        ls -la oppia/build
-        echo "Files in third_party:"
-        ls -la oppia/third_party
-        echo "Contents of requirements_dev.txt:"
-        cat ./oppia/requirements_dev.txt
-        echo "Contents of requirements.txt:"
-        cat ./oppia/requirements.txt
-      working-directory: /home/runner/work/oppia
-      shell: bash
+        key: ${{ runner.os }}-build-files-${{ github.sha }}
+        path: |
+          /home/runner/work/oppia/oppia/build
+          /home/runner/work/oppia/oppia/webpack_bundles
+          /home/runner/work/oppia/oppia/app.yaml
+          /home/runner/work/oppia/oppia/assets/hashes.json
+          /home/runner/work/oppia/oppia/backend_prod_files
+          /home/runner/work/oppia/oppia/dist
+          /home/runner/work/oppia/oppia/third_party/generated
     - name: Build Webpack
-      if: steps.download_artifact.outcome == 'failure'
-      run: |
-        echo "Failed to download build files. Regenerating."
-        python -m scripts.build --prod_env
-      shell: bash
-    - name: Zip build files
-      # We avoid using ../ or absolute paths because unzip treats these as
-      # security issues and will refuse to follow them.
-      run: |
-        zip -rqy build_files.zip oppia/build oppia/webpack_bundles oppia/app.yaml oppia/assets/hashes.json oppia/backend_prod_files oppia/dist oppia/third_party/generated
-      working-directory: /home/runner/work/oppia
+      if: steps.restore_build_files_cache.outputs.cache-hit != 'true'
+      run: python -m scripts.build --prod_env
       shell: bash
-    - name: Upload build files artifact
-      if: steps.download_artifact.outcome == 'failure'
-      uses: actions/upload-artifact@v4
-      with:
-        name: cached_build_files
-        path: /home/runner/work/oppia/build_files.zip
-        retention-days: 7
-        overwrite: true

.github/actions/merge-develop-and-set-up-dependencies/action.yml

@@ -1,10 +1,17 @@
 name: Merge develop and set up dependencies
 description: 'Merge develop into current branch, and set up dependencies'
+inputs:
+  merge_sha:
+    description: 'Specific commit SHA from develop to merge. If empty, falls back to latest develop.'
+    required: false
+    default: ''
 runs:
   using: composite
   steps:
     - name: Merge develop branch into the current branch
       uses: ./.github/actions/merge
+      with:
+        merge_sha: ${{ inputs.merge_sha }}
     - name: Setup Python 3.10.16
       uses: actions/setup-python@v5
       id: setup_python

.github/actions/merge/action.yml

@@ -1,5 +1,10 @@
 name: 'Merge Source Branch into Base Branch'
 description: 'Merge the PR source branch into its base branch, leaving the merge commit checked-out'
+inputs:
+  merge_sha:
+    description: 'Specific commit SHA from develop to merge. If empty, falls back to latest develop.'
+    required: false
+    default: ''
 runs:
   using: 'composite'
   steps:
@@ -20,7 +25,12 @@ runs:
         git remote add source "https://github.com/${{ github.event.pull_request.head.repo.full_name }}.git"
         git remote add base "https://github.com/${{ github.repository }}.git"
         git fetch source $GITHUB_HEAD_REF
-        git fetch base ${{ github.base_ref }}
-        git checkout base/${{ github.base_ref }}
+        if [ -n "${{ inputs.merge_sha }}" ]; then
+          git fetch base ${{ inputs.merge_sha }}
+          git checkout ${{ inputs.merge_sha }}
+        else
+          git fetch base ${{ github.base_ref }}
+          git checkout base/${{ github.base_ref }}
+        fi
         git merge source/$GITHUB_HEAD_REF
       shell: bash

.github/workflows/all_lint_checks.yml

@@ -25,8 +25,20 @@ concurrency:
          || github.ref || github.run_id }}
   cancel-in-progress: true
 jobs:
+  setup_merge_sha:
+    name: Capture develop SHA
+    runs-on: ubuntu-22.04
+    outputs:
+      develop_sha: ${{ steps.get_sha.outputs.sha }}
+    steps:
+      - name: Get latest develop SHA
+        id: get_sha
+        run: |
+          SHA=$(git ls-remote https://github.com/oppia/oppia.git refs/heads/develop | awk '{print $1}')
+          echo "sha=$SHA" >> "$GITHUB_OUTPUT"
   backend_lint:
     name: Backend
+    needs: setup_merge_sha
     runs-on: ubuntu-22.04
     # Skip the job if we were only launched to cancel running jobs via the concurrency key above.
     if: ${{ ! (
@@ -38,9 +50,14 @@ jobs:
         uses: actions/checkout@v4
       - name: Merge develop and set up dependencies
         uses: ./.github/actions/merge-develop-and-set-up-dependencies
+        with:
+          merge_sha: ${{ needs.setup_merge_sha.outputs.develop_sha }}
       - name: Third Party Size Check
         if: startsWith(github.head_ref, 'update-changelog-for-release') == false
         run: python -m scripts.third_party_size_check
+      - name: Check Unused I18N Keys
+        if: startsWith(github.head_ref, 'update-changelog-for-release') == false
+        run: python -m scripts.check_unused_i18n_keys
       - name: Run Lint Checks
         if: startsWith(github.head_ref, 'update-changelog-for-release') == false
         run: python -m scripts.linters.run_lint_checks --shard other --verbose
@@ -52,6 +69,7 @@ jobs:
           webhook-url: ${{ secrets.BUILD_FAILURE_ROOM_WEBHOOK_URL }}
   frontend_lint:
     name: Custom ESLint checks
+    needs: setup_merge_sha
     runs-on: ubuntu-22.04
     # Skip the job if we were only launched to cancel running jobs via the concurrency key above.
     if: ${{ ! (
@@ -63,6 +81,8 @@ jobs:
         uses: actions/checkout@v4
       - name: Merge develop and set up dependencies
         uses: ./.github/actions/merge-develop-and-set-up-dependencies
+        with:
+          merge_sha: ${{ needs.setup_merge_sha.outputs.develop_sha }}
       - name: Run ESLint Tests
         if: startsWith(github.head_ref, 'update-changelog-for-release') == false
         run: python -m scripts.run_custom_eslint_tests
@@ -74,6 +94,7 @@ jobs:
           webhook-url: ${{ secrets.BUILD_FAILURE_ROOM_WEBHOOK_URL }}
   frontend_formatter:
     name: Frontend formatting with prettier
+    needs: setup_merge_sha
     runs-on: ubuntu-22.04
     # Skip the job if we were only launched to cancel running jobs via the concurrency key above.
     if: ${{ ! (
@@ -85,6 +106,8 @@ jobs:
         uses: actions/checkout@v4
       - name: Merge develop and set up dependencies
         uses: ./.github/actions/merge-develop-and-set-up-dependencies
+        with:
+          merge_sha: ${{ needs.setup_merge_sha.outputs.develop_sha }}
       - name: Prettify code
         run: npx prettier --check .
       - name: Explain how to fix the issue
@@ -98,6 +121,7 @@ jobs:
           webhook-url: ${{ secrets.BUILD_FAILURE_ROOM_WEBHOOK_URL }}
   black_formatter:
     name: Frontend formatting with prettier
+    needs: setup_merge_sha
     runs-on: ubuntu-22.04
     # Skip the job if we were only launched to cancel running jobs via the concurrency key above.
     if: ${{ ! (
@@ -109,6 +133,8 @@ jobs:
         uses: actions/checkout@v4
       - name: Merge develop and set up dependencies
         uses: ./.github/actions/merge-develop-and-set-up-dependencies
+        with:
+          merge_sha: ${{ needs.setup_merge_sha.outputs.develop_sha }}
       - name: Black formatting
         run: black --check .
       - name: Explain how to fix the issue

.github/workflows/all_type_checks.yml

@@ -25,8 +25,20 @@ concurrency:
          || github.ref || github.run_id }}
   cancel-in-progress: true
 jobs:
+  setup_merge_sha:
+    name: Capture develop SHA
+    runs-on: ubuntu-22.04
+    outputs:
+      develop_sha: ${{ steps.get_sha.outputs.sha }}
+    steps:
+      - name: Get latest develop SHA
+        id: get_sha
+        run: |
+          SHA=$(git ls-remote https://github.com/oppia/oppia.git refs/heads/develop | awk '{print $1}')
+          echo "sha=$SHA" >> "$GITHUB_OUTPUT"
   backend_type_checks:
     name: Backend
+    needs: setup_merge_sha
     runs-on: ubuntu-22.04
     # Skip the job if we were only launched to cancel running jobs via the concurrency key above.
     if: ${{ ! (
@@ -38,6 +50,8 @@ jobs:
         uses: actions/checkout@v4
       - name: Merge develop and set up dependencies
         uses: ./.github/actions/merge-develop-and-set-up-dependencies
+        with:
+          merge_sha: ${{ needs.setup_merge_sha.outputs.develop_sha }}
       - name: Run Mypy type checks
         run: python -m scripts.run_mypy_checks
       - name: Report failure if failed on oppia/oppia develop branch
@@ -48,6 +62,7 @@ jobs:
           webhook-url: ${{ secrets.BUILD_FAILURE_ROOM_WEBHOOK_URL }}
   frontend_type_checks:
     name: Frontend
+    needs: setup_merge_sha
     runs-on: ubuntu-22.04
     # Skip the job if we were only launched to cancel running jobs via the concurrency key above.
     if: ${{ ! (
@@ -59,6 +74,8 @@ jobs:
         uses: actions/checkout@v4
       - name: Merge develop and set up dependencies
         uses: ./.github/actions/merge-develop-and-set-up-dependencies
+        with:
+          merge_sha: ${{ needs.setup_merge_sha.outputs.develop_sha }}
       - name: Run typescript tests
         run: python -m scripts.run_typescript_checks
       - name: Run typescript tests in strict mode

.github/workflows/backend_unit_tests.yml

@@ -25,8 +25,20 @@ concurrency:
          || github.ref || github.run_id }}
   cancel-in-progress: true
 jobs:
+  setup_merge_sha:
+    name: Capture develop SHA
+    runs-on: ubuntu-22.04
+    outputs:
+      develop_sha: ${{ steps.get_sha.outputs.sha }}
+    steps:
+      - name: Get latest develop SHA
+        id: get_sha
+        run: |
+          SHA=$(git ls-remote https://github.com/oppia/oppia.git refs/heads/develop | awk '{print $1}')
+          echo "sha=$SHA" >> "$GITHUB_OUTPUT"
   run_backend_associated_test_file_checks:
     name: Verify associated test files
+    needs: setup_merge_sha
     runs-on: ubuntu-22.04
     # Skip the job if we were only launched to cancel running jobs via the concurrency key above.
     if: ${{ ! (
@@ -38,7 +50,10 @@ jobs:
         uses: actions/checkout@v4
       - name: Merge develop and set up dependencies
         uses: ./.github/actions/merge-develop-and-set-up-dependencies
+        with:
+          merge_sha: ${{ needs.setup_merge_sha.outputs.develop_sha }}
       - name: Run backend associated test file check
+
         run: python -m scripts.check_backend_associated_test_file
       - name: Report failure if failed on oppia/oppia develop branch
         if: ${{ failure() && github.event_name == 'push' && github.repository == 'oppia/oppia' && github.ref == 'refs/heads/develop'}}
@@ -48,6 +63,7 @@ jobs:
           webhook-url: ${{ secrets.BUILD_FAILURE_ROOM_WEBHOOK_URL }}
   run_tests:
     name: Shard ${{ matrix.shard }}
+    needs: setup_merge_sha
     runs-on: ubuntu-22.04
     # Skip the job if we were only launched to cancel running jobs via the concurrency key above.
     if: ${{ ! (
@@ -63,7 +79,10 @@ jobs:
         uses: actions/checkout@v4
       - name: Merge develop and set up dependencies
         uses: ./.github/actions/merge-develop-and-set-up-dependencies
+        with:
+          merge_sha: ${{ needs.setup_merge_sha.outputs.develop_sha }}
       - name: Run backend test shard
+
         id: run_backend_test_shard
         if: startsWith(github.head_ref, 'update-changelog-for-release') == false
         run: python -m scripts.run_backend_tests --generate_coverage_report --generate_time_report --ignore_coverage --exclude_load_tests --test_shard ${{ matrix.shard }}
@@ -89,13 +108,15 @@ jobs:
           retention-days: 1
   check_combined_coverage:
     name: Check coverage
-    needs: run_tests
+    needs: [run_tests, setup_merge_sha]
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository so that local actions can be used
         uses: actions/checkout@v4
       - name: Merge develop and set up dependencies
         uses: ./.github/actions/merge-develop-and-set-up-dependencies
+        with:
+          merge_sha: ${{ needs.setup_merge_sha.outputs.develop_sha }}
       - name: Download coverage report for shard 1
         if: startsWith(github.head_ref, 'update-changelog-for-release') == false
         uses: actions/download-artifact@v4
@@ -150,13 +171,15 @@ jobs:
       pull-requests: write
   check_backend_test_times:
     name: Check test times
-    needs: run_tests
+    needs: [run_tests, setup_merge_sha]
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository so that local actions can be used
         uses: actions/checkout@v4
       - name: Merge develop and set up dependencies
         uses: ./.github/actions/merge-develop-and-set-up-dependencies
+        with:
+          merge_sha: ${{ needs.setup_merge_sha.outputs.develop_sha }}
       - name: Download time report for shard 1
         uses: actions/download-artifact@v4
         with: