From 9b86dbc7ff29cd8582d8117bd02f0e04f4e8cb8e Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Fri, 20 Dec 2024 16:32:27 -0330
Subject: [PATCH] Fix webpack and test-flask-mv2 builds, remove test-mmi

---
 .circleci/config.yml                      | 12 ++++++------
 development/metamaskbot-build-announce.js |  3 ---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e8b9d4ab15ae..07f47f985bbb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -176,7 +176,6 @@ workflows:
           requires:
             - prep-deps
       - prep-build-test-flask-mv2:
-          <<: *main_master_rc_only
           requires:
             - prep-deps
       - prep-build-test-mmi:
@@ -337,7 +336,6 @@ workflows:
             - prep-build-test-webpack
             - prep-build-test-flask
             - prep-build-test-flask-mv2
-            - prep-build-test-mmi
             - trigger-beta-build
             - prep-build-storybook
             - prep-build-ts-migration-dashboard
@@ -799,10 +797,10 @@ jobs:
           name: Build extension for testing
           command: yarn build:test:flask:mv2
       - run:
-          name: Move test build to 'dist-test-flask' to avoid conflict with production build
+          name: Move test build to 'dist-test-flask-mv2' to avoid conflict with production build
           command: mv ./dist ./dist-test-flask-mv2
       - run:
-          name: Move test zips to 'builds-test-flask' to avoid conflict with production build
+          name: Move test zips to 'builds-test-flask-mv2' to avoid conflict with production build
           command: mv ./builds ./builds-test-flask-mv2
       - persist_to_workspace:
           root: .
@@ -924,10 +922,14 @@ jobs:
       - run:
           name: Move test build to 'dist-test-webpack' to avoid conflict with production build
           command: mv ./dist ./dist-test-webpack
+      - run:
+          name: Move test zips to 'builds-test-webpack' to avoid conflict with production build
+          command: mv ./builds ./builds-test-webpack
       - persist_to_workspace:
           root: .
           paths:
             - dist-test-webpack
+            - builds-test-webpack
 
   prep-build-storybook:
     executor: node-linux-medium
@@ -1547,8 +1549,6 @@ jobs:
           path: builds-test-flask
       - store_artifacts:
           path: builds-test-flask-mv2
-      - store_artifacts:
-          path: builds-test-mmi
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
diff --git a/development/metamaskbot-build-announce.js b/development/metamaskbot-build-announce.js
index 4f218b4831ba..3752f1c4d1da 100755
--- a/development/metamaskbot-build-announce.js
+++ b/development/metamaskbot-build-announce.js
@@ -91,9 +91,6 @@ async function start() {
       chrome: `${BUILD_LINK_BASE}/builds-test-flask/metamask-flask-chrome-${VERSION}-flask.0.zip`,
       firefox: `${BUILD_LINK_BASE}/builds-test-flask-mv2/metamask-flask-firefox-${VERSION}-flask.0.zip`,
     },
-    'builds (test-mmi)': {
-      chrome: `${BUILD_LINK_BASE}/builds-test-mmi/metamask-mmi-chrome-${VERSION}-mmi.0.zip`,
-    },
   };
 
   const buildContentRows = Object.entries(buildMap).map(([label, builds]) => {