Merge branch 'main' into jl/mmp-3814/fix-grant-permissions-add-ethereum-chain

Author: jiexi

.circleci/config.yml

@@ -99,9 +99,6 @@ workflows:
           <<: *rc_branch_only
           requires:
             - prep-deps
-      - trigger-beta-build:
-          requires:
-            - prep-deps
       - prep-deps
       - get-changed-files-with-git-diff:
           filters:
@@ -198,9 +195,6 @@ workflows:
       - validate-source-maps-mv2:
           requires:
             - prep-build-mv2
-      - validate-source-maps-beta:
-          requires:
-            - trigger-beta-build
       - validate-source-maps-flask:
           requires:
             - prep-build-flask
@@ -218,7 +212,6 @@ workflows:
       - all-tests-pass:
           requires:
             - validate-source-maps
-            - validate-source-maps-beta
             - validate-source-maps-flask
             - test-mozilla-lint-mv2
             - test-mozilla-lint-flask-mv2
@@ -250,7 +243,6 @@ workflows:
             - prep-build-test-mv2
             - prep-build-test-flask
             - prep-build-test-flask-mv2
-            - trigger-beta-build
             - prep-build-storybook
             - prep-build-ts-migration-dashboard
             - benchmark
@@ -316,35 +308,6 @@ workflows:
             - validate-locales-only
 
 jobs:
-  trigger-beta-build:
-    executor: node-browsers-small
-    steps:
-      - run: *shallow-git-clone-and-enable-vnc
-      - run: sudo corepack enable
-      - attach_workspace:
-          at: .
-      - when:
-          condition:
-            not:
-              matches:
-                pattern: /^master$/
-                value: << pipeline.git.branch >>
-          steps:
-            - run:
-                name: Build beta prod
-                command: .circleci/scripts/trigger-beta-build.sh
-            - run:
-                name: Move beta build to 'dist-beta' to avoid conflict with production build
-                command: mv ./dist ./dist-beta
-            - run:
-                name: Move beta zips to 'builds-beta' to avoid conflict with production build
-                command: mv ./builds ./builds-beta
-            - persist_to_workspace:
-                root: .
-                paths:
-                  - dist-beta
-                  - builds-beta
-
   create_release_pull_request:
     executor: node-browsers-medium
     steps:
@@ -1089,25 +1052,18 @@ jobs:
       - store_artifacts:
           path: dist/sourcemaps
           destination: builds/sourcemaps
-      - store_artifacts:
-          path: dist-beta/sourcemaps
-          destination: builds-beta/sourcemaps
       - store_artifacts:
           path: dist-flask/sourcemaps
           destination: builds-flask/sourcemaps
       - store_artifacts:
           path: builds
           destination: builds
-      - store_artifacts:
-          path: builds-beta
-          destination: builds-beta
       - store_artifacts:
           path: builds-flask
           destination: builds-flask
       - store_artifacts:
           path: builds-flask-mv2
           destination: builds-flask-mv2
-
       - store_artifacts:
           path: builds-mv2
           destination: builds-mv2
@@ -1204,17 +1160,6 @@ jobs:
           name: Validate source maps
           command: yarn validate-source-maps
 
-  validate-source-maps-beta:
-    executor: node-browsers-small
-    steps:
-      - run: *shallow-git-clone-and-enable-vnc
-      - run: sudo corepack enable
-      - attach_workspace:
-          at: .
-      - run:
-          name: Validate source maps
-          command: .circleci/scripts/validate-source-maps-beta.sh
-
   validate-source-maps-flask:
     executor: node-browsers-small
     steps:

.circleci/scripts/check-working-tree.sh

@@ -0,0 +1,78 @@
+name: Build beta
+
+on:
+  workflow_call:
+
+jobs:
+  build-beta:
+    name: Build beta
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          # By default, the checkout action checks out the last merge commit for pull requests.
+          # Source: https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request
+          # However, we need the head commit (the latest commit pushed to the source branch)
+          # because in the workflow, we would like to parse the latest commit message.
+          # Specifying `ref` ensures that the head commit is checked out directly.
+          # For a `pull_request` event, the head commit hash is `github.event.pull_request.head.sha`.
+          # For a `push` event, the head commit hash is `github.sha`.
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+
+      - name: Needs beta build
+        # For a `pull_request` event, the branch is `github.head_ref``.
+        # For a `push` event, the branch is `github.ref_name`.
+        if: ${{ (github.head_ref || github.ref_name) != 'master' }}
+        id: needs-beta-build
+        env:
+          BRANCH: ${{ github.head_ref || github.ref_name }}
+        run: |
+          version="${BRANCH/Version-v/}"
+          commit_message=$(git show -s --format=%s HEAD)
+          beta_version_regex="Version v[0-9]+\.[0-9]+\.[0-9]+-beta\.[0-9]+"
+
+          if [[ "$commit_message" =~ $beta_version_regex ]]; then
+              printf '%s\n' "Creating a build for $version with $commit_message"
+              echo "NEEDS_BETA_BUILD=true" >> "$GITHUB_OUTPUT"
+          else
+              printf '%s\n' 'Commit message does not match commit message for beta pattern; skipping beta build'
+              echo "NEEDS_BETA_BUILD=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Setup environment
+        if: ${{ steps.needs-beta-build.outputs.NEEDS_BETA_BUILD == 'true' }}
+        uses: metamask/github-tools/.github/actions/setup-environment@main
+
+      - name: Run beta build
+        if: ${{ steps.needs-beta-build.outputs.NEEDS_BETA_BUILD == 'true' }}
+        env:
+          INFURA_PROJECT_ID: 00000000000
+          INFURA_BETA_PROJECT_ID: 00000000000
+          SEGMENT_BETA_WRITE_KEY: 00000000000
+          ENABLE_MV3: true
+        run: |
+          yarn build --build-type beta --platform='chrome' dist
+          yarn build --build-type beta --platform='chrome' prod
+
+      - name: Validate source maps
+        if: ${{ steps.needs-beta-build.outputs.NEEDS_BETA_BUILD == 'true' }}
+        run: yarn validate-source-maps
+
+      - name: Upload 'dist-beta' to S3
+        if: ${{ steps.needs-beta-build.outputs.NEEDS_BETA_BUILD == 'true' }}
+        uses: metamask/github-tools/.github/actions/upload-s3@1233659b3850eb84824d7375e2e0c58eb237701d
+        with:
+          aws-region: ${{ vars.AWS_REGION }}
+          role-to-assume: ${{ vars.AWS_IAM_ROLE }}
+          s3-bucket: ${{ vars.AWS_S3_BUCKET }}/${{ github.event.repository.name }}/${{ github.run_id }}/dist-beta
+          path: dist
+
+      - name: Upload 'builds-beta' to S3
+        if: ${{ steps.needs-beta-build.outputs.NEEDS_BETA_BUILD == 'true' }}
+        uses: metamask/github-tools/.github/actions/upload-s3@1233659b3850eb84824d7375e2e0c58eb237701d
+        with:
+          aws-region: ${{ vars.AWS_REGION }}
+          role-to-assume: ${{ vars.AWS_IAM_ROLE }}
+          s3-bucket: ${{ vars.AWS_S3_BUCKET }}/${{ github.event.repository.name }}/${{ github.run_id }}/builds-beta
+          path: builds

.circleci/scripts/trigger-beta-build.sh

@@ -75,11 +75,19 @@ jobs:
       - wait-for-circleci-workflow-status
     uses: ./.github/workflows/runway.yml
 
+  build-beta:
+    name: Build beta
+    uses: ./.github/workflows/build-beta.yml
+    permissions:
+      contents: read
+      id-token: write
+
   publish-prerelease:
     name: Publish prerelease
     if: ${{ github.event_name == 'pull_request' }}
     needs:
       - wait-for-circleci-workflow-status
+      - build-beta
     uses: ./.github/workflows/publish-prerelease.yml
     secrets:
       PR_COMMENT_TOKEN: ${{ secrets.PR_COMMENT_TOKEN }}
@@ -100,6 +108,7 @@ jobs:
       - validate-lavamoat-policy-webapp
       - run-tests
       - wait-for-circleci-workflow-status
+      - build-beta
     outputs:
       PASSED: ${{ steps.set-output.outputs.PASSED }}
     steps:

.circleci/scripts/validate-source-maps-beta.sh

@@ -72,4 +72,5 @@ jobs:
           MERGE_BASE_COMMIT_HASH: ${{ steps.get-merge-base.outputs.MERGE_BASE }}
           CIRCLE_BUILD_NUM: ${{ steps.get-circleci-job-details.outputs.CIRCLE_BUILD_NUM }}
           CIRCLE_WORKFLOW_JOB_ID: ${{ steps.get-circleci-job-details.outputs.CIRCLE_WORKFLOW_JOB_ID }}
+          HOST_URL: ${{ vars.AWS_CLOUDFRONT_URL }}/${{ github.event.repository.name }}/${{ github.run_id }}
         run: ./development/metamaskbot-build-announce.js