Skip to content

Commit

Permalink
Merge pull request #380 from Concordium/macos-arm-build
Browse files Browse the repository at this point in the history
Macos arm build
  • Loading branch information
soerenbf authored Jan 28, 2025
2 parents 7297e4c + e673818 commit bf3e72f
Show file tree
Hide file tree
Showing 5 changed files with 339 additions and 332 deletions.
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v16.20.2
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.10
2.7.18
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,19 @@ git submodule update --init
Then install dependencies:

```bash
yarn
PYTHON=python2.7 yarn
```

### Windows

On Windows you can run the above through e.g. Git bash, or if you want to run it from the Command Prompt, then
you must add `sh` to your PATH for the proto build to run. You can get `sh` bundled with Git bash.

### MacOS ARM

You'll likely see a lot of errors in the console when installing native dependencies. Ignore these and try to
build and run the application in the next steps to see if the installation was successful.

## Starting Development

Start the app in the `dev` environment.
Expand Down Expand Up @@ -78,13 +83,14 @@ which is only recompiled with a full restart.

## Targeting specific network

To build the application for a specific network you must supply the `TARGET_NET` variable. The value
has to be one of `stagenet`, `testnet`, `protonet`, or `mainnet`, otherwise the build will fail. If `TARGET_NET` is not
To build the application for a specific network you must supply the `TARGET_NET` variable. If `TARGET_NET` is not
set the build will be for `mainnet`. Note that the `TARGET_NET` will be appended to the filenames for
`stagenet` and `testnet`.

Valid networks options are: `stagenet`, `testnet`, `protonet`, or `mainnet`. Default is `mainnet`.

```bash
TARGET_NET=stagenet yarn package
TARGET_NET=testnet yarn package # or any other build/run command
```

## Targeting Ledger emulator (Speculos)
Expand Down
4 changes: 2 additions & 2 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
"postinstall": "yarn electron-rebuild install-app-deps"
},
"license": "MIT",
"dependencies": {
"dependencies": {
"@journeyapps/sqlcipher": "^5.2.0",
"@ledgerhq/hw-transport-node-hid-singleton": "^6.28.14",
"@types/ledgerhq__hw-transport-node-hid": "^4.22.2",
"knex": "0.95.5",
"node-abi": "^2.30.0",
"sqlite3": "5.0.0",
"usb": "2.9.0"
},
},
"resolutions": {
"buffer": "^6.0.3"
}
Expand Down
Loading

0 comments on commit bf3e72f

Please sign in to comment.