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

Changes to build on M1 #460

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changes to build on M1 #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DEPENDENCIES:
- Sparkle

SPEC REPOS:
https://github.com/cocoapods/specs.git:
trunk:
- SocketRocket
- Sparkle

Expand All @@ -17,4 +17,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: f68839bf85fc3a629cc21d58a289a00e2eaaa792

COCOAPODS: 1.7.5
COCOAPODS: 1.10.2
2 changes: 1 addition & 1 deletion Uebersicht.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "export PATH=$PATH:/usr/local/bin\ncd server && npm run-script release\n";
shellScript = "export PATH=$PATH:/usr/local/bin:/opt/homebrew/bin\ncd server && npm run-script release\n";
Copy link
Author

Choose a reason for hiding this comment

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

homebrew changed default path on arm64 - possibly cause at least for a while people were installing both x86_64 bins to rosetta and native ones - idk, there's probs a homebrew issue about it

Copy link

Choose a reason for hiding this comment

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

we probably here want to be in safe side and do PATH=/opt/homebrew/bin:/usr/local/bin:${PATH}
first we try arm64 path (we assume that if it exists we want to use it), then x86_64 one, and finally we consume whatever $PATH user has. this makes things IMHO a bit more predictable and deterministic.

};
DC92346F23015178009D9E2F /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
Expand Down
15 changes: 8 additions & 7 deletions server/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"emotion": "^10.0.27",
"escodegen": "^1.14.3",
"esprima": "^2.7.3",
"fsevents": "^2.1.3",
"fsevents": "^2.3",
"jquery": "^3.5.1",
"minimist": "^1.2.5",
"ms": "^2.0.0",
Expand Down
15 changes: 8 additions & 7 deletions server/release/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.