Skip to content

Commit 2fc901a

Browse files
committed
WIP: migrating actions v3 to v4 - universal mac build.
Signed-off-by: ubi de feo <[email protected]>
1 parent f68c835 commit 2fc901a

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

.github/workflows/build.yml

+5-10
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ jobs:
2727
id: windows
2828
- os: ubuntu-latest
2929
id: linux
30-
- os: macos-13
31-
id: macos-x64
32-
- os: macos-14
33-
id: macos-arm64
30+
- os: macos-latest
31+
id: macos-universal
3432
runs-on: ${{ matrix.config.os }}
3533
timeout-minutes: 90
3634

@@ -113,12 +111,9 @@ jobs:
113111
- path: "*-linux_x64.zip"
114112
name: Arduino-Lab-for-MicroPython_Linux_X86-64
115113
id: linux
116-
- path: "*-mac_x64.zip"
117-
name: Arduino-Lab-for-MicroPython_macOS_X86-64
118-
id: macos-x64
119-
- path: "*-mac_arm64.zip"
120-
name: Arduino-Lab-for-MicroPython_macOS_arm-64
121-
id: macos-arm64
114+
- path: "*-mac_universal.zip"
115+
name: Arduino-Lab-for-MicroPython_macOS_Universal
116+
id: macos-universal
122117
# - path: "*Windows_64bit.exe"
123118
# name: Windows_X86-64_interactive_installer
124119
# id: windows

package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
"artifactName": "${productName}-${os}_${arch}.${ext}",
2424
"extraResources": "./ui/arduino/helpers.py",
2525
"mac": {
26-
"target": "zip",
26+
"target": [{
27+
"target": "zip",
28+
"arch": ["universal"]
29+
}],
2730
"icon": "build_resources/icon.icns"
2831
},
2932
"win": {

0 commit comments

Comments
 (0)