Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: fixing m1 installation issues for m1 macs #20345

Merged
merged 7 commits into from
Feb 23, 2022
Merged

chore: fixing m1 installation issues for m1 macs #20345

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6db9efb
chore: fixing m1 installation issues for m1 macs
JessicaSachs Feb 23, 2022
139e8a2
test: testing the m1 build
JessicaSachs Feb 23, 2022
3d737f7
Merge branch 'develop' into chore/beta-release-m1-support
JessicaSachs Feb 23, 2022
0e2a00c
typo
JessicaSachs Feb 23, 2022
c64c8b5
Merge branch 'chore/beta-release-m1-support' of github.com:cypress-io…
JessicaSachs Feb 23, 2022
b8211cb
typo.... again..
JessicaSachs Feb 23, 2022
df6c026
reverting the circle changes
JessicaSachs Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ mainBuildFilters: &mainBuildFilters
branches:
only:
- develop
- 10.0-release
- chore/beta-release-m1-support
- fix-darwin-win32-node-modules-install
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JessicaSachs You'll want to leave the 10.0-release branch since this would erase those rules when it merges into 10.0-release. You'll want to replace anywhere that fix-darwin-win32-node-modules-install is written with this branch: chore/beta-release-m1-support

Copy link
Contributor Author

@JessicaSachs JessicaSachs Feb 23, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm reverting this change completely after i test.

I added a commit really quick to build and test this. I'll take it out after I test manually. Don't merge until then.


# usually we don't build Mac app - it takes a long time
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion cli/lib/tasks/install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const _ = require('lodash')
const arch = require('arch')
const os = require('os')
const url = require('url')
const path = require('path')
Expand Down Expand Up @@ -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()
}
Expand Down