Skip to content

Commit

Permalink
feature: Adds macOS arm64 support (#2443)
Browse files Browse the repository at this point in the history
* Adds macOS arm64 support

* Bump version

* Try downgrading python

* bump

* fix install command

* fix install command

* bump

* bump version set PATH

* Update config.yml and bump version

* Fix build bump version

* Skip cache for now

* try this

* Fix version mismatch

* Use force flag

* Update publish command

* update command

* Fix script again

* Bump version, update build script

* Add back build steps for linux and win, bump version

* Fix another npm mystery

* remove cruft bump version
  • Loading branch information
comountainclimber authored Oct 19, 2022
1 parent c530cbb commit 3e3d0c3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
5 changes: 2 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ jobs:
resource_class: large
steps:
- checkout
- restore_cache:
key: neon-wallet-dependencies-cache-{{ checksum "yarn.lock" }}
- run: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
- run: apt-get -y update
- run: apt-get -y install libusb-1.0-0-dev icnsutils graphicsmagick libudev-dev
Expand All @@ -62,7 +60,8 @@ jobs:
steps:
- checkout
- run: yarn install --ignore-engines --frozen-lockfile --network-timeout 1000000 --network-concurrency 1
- run: yarn release
- run: npm --build-from-source install node-pre-gyp --force
- run: yarn release:mac
- store_artifacts:
path: dist
destination: build
Expand Down
15 changes: 12 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Neon",
"version": "2.15.4",
"version": "2.16.16",
"main": "./main.js",
"description": "Light wallet for NEO blockchain",
"homepage": "https://github.com/CityOfZion/neon-wallet",
Expand All @@ -17,7 +17,8 @@
"test:e2e": "ava __e2e__/*.e2e.js --timeout=120s -s",
"test-watch": "jest --watch",
"pack": "build --dir",
"release": "yarn assets && dotenv yarn electron-builder --publish",
"release": "yarn assets && yarn electron-builder --publish always",
"release:mac": "yarn assets && yarn electron-builder --publish always --mac --x64 --arm64",
"dist": "yarn assets && dotenv yarn electron-builder",
"lint": "eslint -c .eslintrc ./app --ext .js,.jsx --ignore-pattern dist/",
"lint-fix": "eslint -c .eslintrc ./app --ext .js,.jsx --fix --ignore-pattern dist/",
Expand Down Expand Up @@ -69,7 +70,15 @@
"hardenedRuntime": true,
"entitlements": "mac-config/entitlements.mac.plist",
"entitlementsInherit": "mac-config/entitlements.mac.plist",
"artifactName": "${productName}.${version}.${ext}"
"artifactName": "${productName}.${version}.${arch}.${ext}",
"type": "distribution",
"target": {
"target": "default",
"arch": [
"arm64",
"x64"
]
}
},
"linux": {
"target": [
Expand Down

0 comments on commit 3e3d0c3

Please sign in to comment.