Merge branch 'main' into defi-better-polling

Author: bergarces

.github/actions/page-load-benchmark-comment/action.yml

@@ -9,13 +9,13 @@ if [[ -z "${EXTENSION_BENCHMARK_STATS_TOKEN:-}" ]]; then
     exit 1
 fi
 
-if [[ -z "${GITHUB_SHA:-}" ]]; then
-    printf '%s\n' 'GITHUB_SHA environment variable must be set'
+if [[ -z "${HEAD_COMMIT_HASH:-}" ]]; then
+    printf '%s\n' 'HEAD_COMMIT_HASH environment variable must be set'
     exit 1
 fi
 
-if [[ -z "${GITHUB_REPOSITORY_OWNER:-}" ]]; then
-    printf '%s\n' 'GITHUB_REPOSITORY_OWNER environment variable must be set'
+if [[ -z "${OWNER:-}" ]]; then
+    printf '%s\n' 'OWNER environment variable must be set'
     exit 1
 fi
 
@@ -33,7 +33,7 @@ git fetch origin main:main
 
 git checkout main
 
-BENCHMARK_FILE="../test-artifacts/benchmarks/benchmark-results.json"
+BENCHMARK_FILE="../test-artifacts/benchmarks/page-load-benchmark-results.json"
 STATS_FILE="stats/page_load_data.json"
 TEMP_FILE="stats/page_load_data.temp.json"
 
@@ -53,13 +53,13 @@ jq . "${BENCHMARK_FILE}" > /dev/null || {
 }
 
 # Check if the SHA already exists in the stats file
-if jq -e "has(\"${GITHUB_SHA}\")" "${STATS_FILE}" > /dev/null; then
-    echo "SHA ${GITHUB_SHA} already exists in stats file. No new commit needed."
+if jq -e "has(\"${HEAD_COMMIT_HASH}\")" "${STATS_FILE}" > /dev/null; then
+    echo "SHA ${HEAD_COMMIT_HASH} already exists in stats file. No new commit needed."
     exit 0
 fi
 
 # Append new benchmark data correctly using jq
-jq --arg sha "${GITHUB_SHA}" --argjson data "$(cat "${BENCHMARK_FILE}")" \
+jq --arg sha "${HEAD_COMMIT_HASH}" --argjson data "$(cat "${BENCHMARK_FILE}")" \
     '. + {($sha): $data}' "${STATS_FILE}" > "${TEMP_FILE}"
 
 # Overwrite the original JSON file with the corrected version
@@ -68,9 +68,9 @@ mv "${TEMP_FILE}" "${STATS_FILE}"
 # Only add the JSON file
 git add stats/page_load_data.json
 
-git commit --message "Adding page load benchmark data at commit: ${GITHUB_SHA}"
+git commit --message "Adding page load benchmark data at commit: ${HEAD_COMMIT_HASH}"
 
-repo_slug="${GITHUB_REPOSITORY_OWNER}/extension_benchmark_stats"
+repo_slug="${OWNER}/extension_benchmark_stats"
 
 git push "https://metamaskbot:${EXTENSION_BENCHMARK_STATS_TOKEN}@github.com/${repo_slug}" main
 

.github/scripts/benchmark-stats-commit.sh

@@ -22,7 +22,7 @@ on:
     - cron: '0 2-6 * * *'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.sha || github.ref }}
   cancel-in-progress: ${{ !(contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/heads/stable')) }}
 
 env:
@@ -241,22 +241,15 @@ jobs:
           s3-bucket: ${{ vars.AWS_S3_BUCKET }}/${{ github.event.repository.name }}/${{ github.run_id }}/bundle-size
           path: test-artifacts/chrome
 
-  page-load-benchmark-pr:
+  page-load-benchmark:
     needs:
       - build-test-browserify
-    if: ${{ github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref_name == 'main') }}
-    uses: ./.github/workflows/page-load-benchmark-pr.yml
-    with:
-      browser-loads: '10'
-      page-loads: '10'
-
-  page-load-benchmark-upload:
-    needs:
-      - page-load-benchmark-pr
-    if: github.ref == 'refs/heads/main'
-    uses: ./.github/workflows/page-load-benchmark-upload.yml
+    uses: ./.github/workflows/page-load-benchmark.yml
     secrets:
       EXTENSION_BENCHMARK_STATS_TOKEN: ${{ secrets.EXTENSION_BENCHMARK_STATS_TOKEN }}
+    with:
+      browser-loads: 10
+      page-loads: 10
 
   needs-e2e:
     needs:
@@ -336,6 +329,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       INFURA_PROJECT_ID: ${{ secrets.INFURA_PROJECT_ID }}
       GOOGLE_PROD_CLIENT_ID: 00000000000
       APPLE_PROD_CLIENT_ID: 00000000000
@@ -345,7 +339,8 @@ jobs:
       APPLE_EXPERIMENTAL_CLIENT_ID: 00000000000
       GOOGLE_FLASK_CLIENT_ID: 00000000000
       APPLE_FLASK_CLIENT_ID: 00000000000
-
+    outputs:
+      lavamoat-policy-changed: ${{ steps.lavamoat-policy-changed.outputs.lavamoat-policy-changed }}
     steps:
       - name: Checkout and setup environment
         uses: MetaMask/action-checkout-and-setup@v1
@@ -354,15 +349,47 @@ jobs:
           skip-allow-scripts: true
           use-yarn-hydrate: true
 
+      - name: Download changed-files artifact
+        if: ${{ env.BRANCH != 'main' }}
+        id: download-changed-files
+        continue-on-error: true
+        uses: actions/download-artifact@v4
+        with:
+          name: changed-files
+          path: ./changed-files/
+
+      # if the changed-files artifact does not exist, we get the diff
+      - run: yarn tsx .github/scripts/git-diff-default-branch.ts
+        if: ${{ steps.download-changed-files.outcome == 'failure' }}
+
+      - name: See if lavamoat policy files have changed
+        id: lavamoat-policy-changed
+        run: |
+          # if 'changed-files/changed-files.json' exists, check if it contains any files named policy.json or policy-override.json
+          if [ -f "changed-files/changed-files.json" ]; then
+            if grep -q -e 'policy.json' -e 'policy-override.json' changed-files/changed-files.json; then
+              echo "Lavamoat policy file changes detected."
+              echo "lavamoat-policy-changed=true" >> "$GITHUB_OUTPUT"
+            else
+              echo "No Lavamoat policy file changes detected."
+              echo "lavamoat-policy-changed=false" >> "$GITHUB_OUTPUT"
+            fi
+          else
+            echo "Cannot find 'changed-files.json', assuming that Lavamoat policy files have changed."
+            echo "lavamoat-policy-changed=true" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Download artifact 'build-dist-browserify'
+        if: ${{ steps.lavamoat-policy-changed.outputs.lavamoat-policy-changed == 'true' }}
         uses: actions/download-artifact@v4
         with:
           name: build-dist-browserify
 
       - run: ./.github/scripts/create-lavamoat-viz.sh
+        if: ${{ steps.lavamoat-policy-changed.outputs.lavamoat-policy-changed == 'true' }}
 
       - name: Upload 'build-viz' to S3
-        if: ${{ vars.AWS_REGION && vars.AWS_IAM_ROLE && vars.AWS_S3_BUCKET }}
+        if: ${{ steps.lavamoat-policy-changed.outputs.lavamoat-policy-changed == 'true' && vars.AWS_REGION && vars.AWS_IAM_ROLE && vars.AWS_S3_BUCKET }}
         uses: metamask/github-tools/.github/actions/upload-s3@1233659b3850eb84824d7375e2e0c58eb237701d
         with:
           aws-region: ${{ vars.AWS_REGION }}
@@ -372,6 +399,7 @@ jobs:
 
   publish-prerelease:
     name: Publish prerelease
+    if: ${{ github.event_name != 'merge_group' }} # Skip this job for the Merge Queue
     needs:
       - build-dist-browserify
       - build-dist-mv2-browserify
@@ -384,12 +412,15 @@ jobs:
       - build-test-flask-browserify
       - build-test-flask-mv2-browserify
       - run-benchmarks
+      - page-load-benchmark
       - bundle-size
       - build-storybook
       - build-ts-migration-dashboard
       - build-source-map-explorer
       - build-lavamoat-viz
     uses: ./.github/workflows/publish-prerelease.yml
+    with:
+      lavamoat-policy-changed: ${{ needs.build-lavamoat-viz.outputs.lavamoat-policy-changed == 'true' }}
     secrets:
       PR_COMMENT_TOKEN: ${{ secrets.PR_COMMENT_TOKEN }}
 

.github/workflows/fitness-functions.yml

@@ -6,13 +6,16 @@ on:
       browser-loads:
         description: 'Number of browser loads to perform'
         required: false
-        type: string
-        default: '10'
+        type: number
+        default: 10
       page-loads:
         description: 'Number of page loads per browser'
         required: false
-        type: string
-        default: '10'
+        type: number
+        default: 10
+    secrets:
+      EXTENSION_BENCHMARK_STATS_TOKEN:
+        required: true
 
 jobs:
   page-load-benchmark-pr:
@@ -23,28 +26,42 @@ jobs:
       OWNER: ${{ github.repository_owner }}
       REPOSITORY: ${{ github.event.repository.name }}
       PR_NUMBER: ${{ github.event.pull_request.number }}
-      GITHUB_SHA: ${{ github.event.pull_request.head.sha }}
+      HEAD_COMMIT_HASH: ${{ github.event.pull_request.head.sha || github.sha }}
+      BENCHMARK_BROWSER_LOADS: ${{ inputs.browser-loads }}
+      BENCHMARK_PAGE_LOADS: ${{ inputs.page-loads }}
+      IS_PR_OR_MAIN: ${{ github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref_name == 'main') }}
     steps:
       - name: Checkout and setup environment
+        if: ${{ env.IS_PR_OR_MAIN }}
         uses: MetaMask/action-checkout-and-setup@v1
         with:
           is-high-risk-environment: false
           skip-allow-scripts: true
           use-yarn-hydrate: true
 
       - name: Download artifact 'build-test-browserify'
+        if: ${{ env.IS_PR_OR_MAIN }}
         uses: actions/download-artifact@v4
         with:
           name: build-test-browserify
 
       - name: Install Playwright browsers
+        if: ${{ env.IS_PR_OR_MAIN }}
         run: yarn playwright install chromium
 
       - name: Run page load benchmarks
+        if: ${{ env.IS_PR_OR_MAIN }}
         run: yarn test:e2e:benchmark
 
       - name: Upload benchmark results (github artifacts)
+        if: ${{ env.IS_PR_OR_MAIN }}
         uses: actions/upload-artifact@v4
         with:
-          name: benchmark-results
-          path: test-artifacts/benchmarks/benchmark-results.json
+          name: page-load-benchmark-results
+          path: test-artifacts/benchmarks/page-load-benchmark-results.json
+
+      - name: Upload benchmark results (historical data)
+        if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
+        run: .github/scripts/benchmark-stats-commit.sh
+        env:
+          EXTENSION_BENCHMARK_STATS_TOKEN: ${{ secrets.EXTENSION_BENCHMARK_STATS_TOKEN }}

.github/workflows/main.yml

@@ -5,6 +5,11 @@ on:
     secrets:
       PR_COMMENT_TOKEN:
         required: true
+    inputs:
+      lavamoat-policy-changed:
+        description: 'Whether the Lavamoat policy files have changed'
+        required: true
+        type: boolean
 
 jobs:
   publish-prerelease:
@@ -25,6 +30,7 @@ jobs:
       MERGE_BASE_COMMIT_HASH: '' # placeholder so that we have autocomplete and logs
       CLOUDFRONT_REPO_URL: ${{ vars.AWS_CLOUDFRONT_URL }}/${{ github.event.repository.name }}
       HOST_URL: ${{ vars.AWS_CLOUDFRONT_URL }}/${{ github.event.repository.name }}/${{ github.run_id }}
+      LAVAMOAT_POLICY_CHANGED: ${{ inputs.lavamoat-policy-changed }}
     steps:
       - name: Checkout and setup high risk environment
         uses: MetaMask/action-checkout-and-setup@v1
@@ -61,12 +67,12 @@ jobs:
           echo "MERGE_BASE_COMMIT_HASH=${merge_base_commit_hash}" >> "${GITHUB_ENV}"
           echo "The merge base commit hash is '${merge_base_commit_hash}'"
 
-      - name: Page load benchmark comment
+      - name: Download page load benchmark results
         if: ${{ github.event_name == 'pull_request' }}
-        uses: ./.github/actions/page-load-benchmark-comment
+        uses: actions/download-artifact@v4
         with:
-          head-commit-hash: ${{ env.HEAD_COMMIT_HASH }}
-          pr-comment-token: ${{ secrets.PR_COMMENT_TOKEN }}
+          name: page-load-benchmark-results
+          path: test-artifacts/benchmarks
 
       - name: Publish prerelease
         if: ${{ env.MERGE_BASE_COMMIT_HASH && env.PR_NUMBER && env.PR_COMMENT_TOKEN && vars.AWS_CLOUDFRONT_URL }}