diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index efb7a01ad7c..04704a4f8ff 100644 --- a/.github/actions/publish/action.yml +++ b/.github/actions/publish/action.yml @@ -115,20 +115,21 @@ runs: if [[ $runner_os =~ linux ]]; then BUILD_ARCH='x64' + npm run make -- --arch="${BUILD_ARCH}" elif [[ $runner_os =~ darwin|macos|osx ]]; then BUILD_ARCH='x64,arm64' + npm run make -- --arch="${BUILD_ARCH}" elif [[ $runner_os =~ windows|win ]]; then BUILD_ARCH='ia32,x64' + npm run make-debug-win -- --arch="${BUILD_ARCH}" else echo "ERROR: unexpected runner OS: ${runner_os}" exit 1 fi - npm run make -- --arch="${BUILD_ARCH}" - echo "version=${APPLICATION_VERSION}" >> $GITHUB_OUTPUT env: diff --git a/forge.config.ts b/forge.config.ts index 217a4c104ee..734c5a947f3 100644 --- a/forge.config.ts +++ b/forge.config.ts @@ -7,7 +7,7 @@ import { MakerDMG } from '@electron-forge/maker-dmg'; import { MakerAppImage } from '@reforged/maker-appimage'; import { AutoUnpackNativesPlugin } from '@electron-forge/plugin-auto-unpack-natives'; import { WebpackPlugin } from '@electron-forge/plugin-webpack'; -import { ResourcePlugin } from 'electron-forge-resource-plugin'; +// import { ResourcePlugin } from 'electron-forge-resource-plugin'; import { mainConfig, rendererConfig } from './webpack.config'; @@ -134,6 +134,7 @@ const config: ForgeConfig = { ], }, }), + /* new ResourcePlugin({ env: 'ETCHER_UTIL_BIN_PATH', path: `out/sidecar/bin/etcher-util${process.platform === 'win32' ? '.exe' : ''}`, @@ -142,6 +143,7 @@ const config: ForgeConfig = { sources: './lib/util/', }, }), + */ ], }; diff --git a/package.json b/package.json index 67802ce2527..6160b12002a 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,9 @@ "test": "echo npm run test-{linux,windows,macos}", "package": "electron-forge package", "start": "electron-forge start", - "make": "electron-forge make" + "make": "electron-forge make", + "make-debug": "DEBUG='electron-forge:*,electron-packager,electron-rebuild' npm run make", + "make-debug-win": "@powershell -Command $env:DEBUG='electron-forge:*,electron-packager,electron-rebuild,electron-windows-installer:main';npm run make" }, "husky": { "hooks": {