diff --git a/Jenkinsfile b/Jenkinsfile index 1e35dac..c24bd0e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -102,7 +102,7 @@ try { parallel( 'Windows Build': buildOnLabel('windows', 'pnpm build:electron'), - 'MacOS Build': buildOnLabel('macos', 'pnpm build:electron'), + 'MacOS Build': buildOnLabel('macos', 'pnpm build:electron:mac'), 'Ubuntu Build': { buildLinux() } ) diff --git a/package.json b/package.json index 8ad5f93..044828e 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "build:renderer": "pnpm build:electron-renderer && shx cp src/electron/preload.js build/electron/ && shx rm -rf build/electron/App.jsx build/electron/main.jsx build/electron/App.css build/electron/index.css build/electron/FarmControlLogo.jsx build/electron/vite.config.js build/electron/public build/electron/build", "build:electron-renderer": "vite build src/electron --outDir build/electron", "build:electron": "pnpm build && electron-builder", + "build:electron:mac": "pnpm build && electron-builder --mac --arm64 && electron-builder --mac --x64", "build:linux": "pnpm run cleanBuild && pnpm run build:server && shx mkdir -p app_dist/linux && pkg . --targets node18-linux-x64 --output app_dist/linux/farmcontrol-server && fpm -f -s dir -t deb -n farmcontrol-server -p app_dist/linux/ -v $(node -p \"require('./package.json').version\") --after-install packaging/linux/after-install.sh --after-remove packaging/linux/after-remove.sh app_dist/linux/farmcontrol-server=/usr/bin/farmcontrol-server packaging/linux/farmcontrol-server.service=/lib/systemd/system/farmcontrol-server.service && fpm -f -s dir -t rpm -n farmcontrol-server -p app_dist/linux/ -v $(node -p \"require('./package.json').version\") --after-install packaging/linux/after-install.sh --after-remove packaging/linux/after-remove.sh app_dist/linux/farmcontrol-server=/usr/bin/farmcontrol-server packaging/linux/farmcontrol-server.service=/lib/systemd/system/farmcontrol-server.service", "cleanBuild": "rimraf build" },