Skip to content

Commit 37b00d5

Browse files
authored
Build standalone tool as universal on macOS (#618)
1 parent 8f25ff1 commit 37b00d5

File tree

3 files changed

+46
-131
lines changed

3 files changed

+46
-131
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Notarize Standalone Utility
4545
uses: wpilibsuite/xcode-notarize@v1
4646
with:
47-
product-path: "wpilib-utility-standalone/build/wpilibutility-darwin-x64/wpilibutility.app"
47+
product-path: "wpilib-utility-standalone/build/wpilibutility-darwin-universal/wpilibutility.app"
4848
primary-bundle-id: edu.wpi.first.wpilibutility
4949
appstore-connect-username: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
5050
appstore-connect-password: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
@@ -53,11 +53,11 @@ jobs:
5353
(github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
5454
- name: Staple Notarization Ticket
5555
run: xcrun stapler staple -v wpilibutility.app
56-
working-directory: wpilib-utility-standalone/build/wpilibutility-darwin-x64
56+
working-directory: wpilib-utility-standalone/build/wpilibutility-darwin-universal
5757
if: |
5858
(github.repository_owner == 'wpilibsuite') &&
5959
(github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
60-
- run: tar -C build/wpilibutility-darwin-x64 -pcvzf wpilibutility-mac.tar.gz .
60+
- run: tar -C build/wpilibutility-darwin-universal -pcvzf wpilibutility-mac.tar.gz .
6161
working-directory: wpilib-utility-standalone
6262
name: Create Archive
6363
- uses: actions/upload-artifact@v3

wpilib-utility-standalone/package-lock.json

Lines changed: 40 additions & 125 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wpilib-utility-standalone/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"watch": "tsc -watch -p ./",
1111
"packageWindows": "electron-packager . wpilibutility --platform=win32 --overwrite --out ./build",
1212
"packageLinux": "electron-packager . wpilibutility --platform=linux --overwrite --out ./build",
13-
"packageMac": "electron-packager . wpilibutility --platform=darwin --overwrite --out ./build",
14-
"signMac": "electron-osx-sign build/wpilibutility-darwin-x64/wpilibutility.app --entitlements=macOS/WPILibStandaloneUtility.entitlements --entitlements-inherit=macOS/WPILibStandaloneUtility.entitlements --hardened-runtime=true --no-gatekeeper-assess"
13+
"packageMac": "electron-packager . wpilibutility --platform=darwin --arch=universal --overwrite --out ./build",
14+
"signMac": "electron-osx-sign build/wpilibutility-darwin-universal/wpilibutility.app --entitlements=macOS/WPILibStandaloneUtility.entitlements --entitlements-inherit=macOS/WPILibStandaloneUtility.entitlements --hardened-runtime=true --no-gatekeeper-assess"
1515
},
1616
"main": "out/main.js",
1717
"repository": "https://github.com/wpilibsuite/vscode-wpilib",
@@ -26,7 +26,7 @@
2626
"@types/node-fetch": "^2.6.4",
2727
"@types/temp": "^0.8.34",
2828
"@types/triple-beam": "^1.3.1",
29-
"electron": "10.1.7",
29+
"electron": "11.5.0",
3030
"electron-packager": "^17.1.2",
3131
"rmdir-cli": "^2.0.6",
3232
"tslint": "^6.1.3",

0 commit comments

Comments
 (0)