Skip to content

Commit 27ef2af

Browse files
authored
Merge pull request #116 from arduino/github/apple-silicon-build
GitHub/apple silicon build
2 parents 2e45b71 + 87bf0d1 commit 27ef2af

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.github/workflows/build.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ jobs:
2424
config:
2525
- os: windows-2019
2626
- os: ubuntu-latest
27-
- os: macos-latest
27+
- os: macos-13
28+
- os: macos-14
2829
runs-on: ${{ matrix.config.os }}
2930
timeout-minutes: 90
3031

@@ -99,6 +100,8 @@ jobs:
99100
name: Arduino-Lab-for-MicroPython_Linux_X86-64
100101
- path: "*-mac_x64.zip"
101102
name: Arduino-Lab-for-MicroPython_macOS_X86-64
103+
- path: "*-mac_arm64.zip"
104+
name: Arduino-Lab-for-MicroPython_macOS_arm-64
102105
# - path: "*Windows_64bit.exe"
103106
# name: Windows_X86-64_interactive_installer
104107
# - path: "*Windows_64bit.msi"

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"post-set-shell": "npm config set script-shell bash",
99
"rebuild": "electron-rebuild",
1010
"dev": "electron --inspect ./",
11-
"build": "npm run post-set-shell && electron-builder $(if [ $(uname -m) = arm64 ]; then echo --mac --x64; fi)",
11+
"build": "npm run post-set-shell && electron-builder",
1212
"postinstall": "npm run post-set-shell && npm run rebuild"
1313
},
1414
"devDependencies": {

0 commit comments

Comments
 (0)