From 6db9efb70900c2908b17592ceec14c942a92bec9 Mon Sep 17 00:00:00 2001
From: Jessica Sachs <jess@jessicasachs.io>
Date: Wed, 23 Feb 2022 16:13:42 -0500
Subject: [PATCH 1/5] chore: fixing m1 installation issues for m1 macs

---
 cli/lib/tasks/install.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cli/lib/tasks/install.js b/cli/lib/tasks/install.js
index 02a678aad27d..10d342645142 100644
--- a/cli/lib/tasks/install.js
+++ b/cli/lib/tasks/install.js
@@ -1,4 +1,5 @@
 const _ = require('lodash')
+const arch = require('arch')
 const os = require('os')
 const url = require('url')
 const path = require('path')
@@ -105,7 +106,7 @@ const getBinaryUrlFromPrereleaseNpmUrl = (npmUrl) => {
 
   const { version, artifactSlug } = matches.groups
 
-  parsed.pathname = `/beta/binary/${version}/${os.platform()}-${os.arch()}/${artifactSlug}/cypress.zip`
+  parsed.pathname = `/beta/binary/${version}/${os.platform()}-${arch()}/${artifactSlug}/cypress.zip`
 
   return parsed.format()
 }

From 139e8a299b00b7c720de82b5e804c8acea494d86 Mon Sep 17 00:00:00 2001
From: Jessica Sachs <jess@jessicasachs.io>
Date: Wed, 23 Feb 2022 16:21:10 -0500
Subject: [PATCH 2/5] test: testing the m1 build

---
 circle.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 2edd9135a6af..f70ccc156f9d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -28,7 +28,7 @@ mainBuildFilters: &mainBuildFilters
     branches:
       only:
         - develop
-        - 10.0-release
+        - chore/beta-release-m1-support
         - fix-darwin-win32-node-modules-install
 
 # usually we don't build Mac app - it takes a long time
@@ -1626,7 +1626,7 @@ jobs:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "fix-darwin-win32-node-modules-install" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "fix-darwin-win32-node-modules-install" && "$CIRCLE_BRANCH" != "- chore/beta-release-m1-support" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi

From 0e2a00c69beddfa71048e4630422d867e2dd3dc4 Mon Sep 17 00:00:00 2001
From: Jessica Sachs <jess@jessicasachs.io>
Date: Wed, 23 Feb 2022 16:52:38 -0500
Subject: [PATCH 3/5] typo

---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index f70ccc156f9d..c23fee55d32b 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1626,7 +1626,7 @@ jobs:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "fix-darwin-win32-node-modules-install" && "$CIRCLE_BRANCH" != "- chore/beta-release-m1-support" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "fix-darwin-win32-node-modules-install" && "$CIRCLE_BRANCH" != "chore/beta-release-m1-support" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi

From b8211cbd6b65baff598999cd0e712256f9b9c96e Mon Sep 17 00:00:00 2001
From: Jessica Sachs <jess@jessicasachs.io>
Date: Wed, 23 Feb 2022 17:11:22 -0500
Subject: [PATCH 4/5] typo.... again..

---
 circle.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/circle.yml b/circle.yml
index c23fee55d32b..045f22c68a26 100644
--- a/circle.yml
+++ b/circle.yml
@@ -39,6 +39,7 @@ macWorkflowFilters: &mac-workflow-filters
     or:
     - equal: [ develop, << pipeline.git.branch >> ]
     - equal: [ fix-darwin-win32-node-modules-install, << pipeline.git.branch >> ]
+    - equal: [ chore/beta-release-m1-support, << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
           value: << pipeline.git.branch >>

From df6c02633da0d59b3f53ddf1baffaab93f089874 Mon Sep 17 00:00:00 2001
From: Jessica Sachs <jess@jessicasachs.io>
Date: Wed, 23 Feb 2022 18:16:53 -0500
Subject: [PATCH 5/5] reverting the circle changes

---
 circle.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/circle.yml b/circle.yml
index 045f22c68a26..2edd9135a6af 100644
--- a/circle.yml
+++ b/circle.yml
@@ -28,7 +28,7 @@ mainBuildFilters: &mainBuildFilters
     branches:
       only:
         - develop
-        - chore/beta-release-m1-support
+        - 10.0-release
         - fix-darwin-win32-node-modules-install
 
 # usually we don't build Mac app - it takes a long time
@@ -39,7 +39,6 @@ macWorkflowFilters: &mac-workflow-filters
     or:
     - equal: [ develop, << pipeline.git.branch >> ]
     - equal: [ fix-darwin-win32-node-modules-install, << pipeline.git.branch >> ]
-    - equal: [ chore/beta-release-m1-support, << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
           value: << pipeline.git.branch >>
@@ -1627,7 +1626,7 @@ jobs:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "fix-darwin-win32-node-modules-install" && "$CIRCLE_BRANCH" != "chore/beta-release-m1-support" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "fix-darwin-win32-node-modules-install" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi