Skip to content

Commit

Permalink
adsfc
Browse files Browse the repository at this point in the history
  • Loading branch information
dfunckt committed Nov 14, 2023
1 parent 880a498 commit 9cda708
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .github/actions/publish/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion forge.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -134,6 +134,7 @@ const config: ForgeConfig = {
],
},
}),
/*
new ResourcePlugin({
env: 'ETCHER_UTIL_BIN_PATH',
path: `out/sidecar/bin/etcher-util${process.platform === 'win32' ? '.exe' : ''}`,
Expand All @@ -142,6 +143,7 @@ const config: ForgeConfig = {
sources: './lib/util/',
},
}),
*/
],
};

Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down

0 comments on commit 9cda708

Please sign in to comment.