Skip to content

Commit

Permalink
dddd
Browse files Browse the repository at this point in the history
  • Loading branch information
dfunckt committed Nov 9, 2023
1 parent d9865ff commit 6dac465
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 13 deletions.
5 changes: 3 additions & 2 deletions .github/actions/publish/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,20 +129,21 @@ runs:
if [[ $runner_os =~ linux ]]; then
BUILD_ARCH='x64'
npm run make-debug -- --arch="${BUILD_ARCH}"
elif [[ $runner_os =~ darwin|macos|osx ]]; then
BUILD_ARCH='x64,arm64'
npm run make-debug -- --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
2 changes: 1 addition & 1 deletion .github/workflows/flowzone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
(github.event.pull_request.head.repo.full_name != github.repository && github.event_name == 'pull_request_target')
secrets: inherit
with:
tests_run_on: '["ubuntu-20.04","macos-12","windows-2019"]'
tests_run_on: '["windows-2019"]'
restrict_custom_actions: false
github_prerelease: true
repo_config: true
Expand Down
9 changes: 0 additions & 9 deletions forge.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ 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 { mainConfig, rendererConfig } from './webpack.config';

Expand Down Expand Up @@ -134,14 +133,6 @@ const config: ForgeConfig = {
],
},
}),
new ResourcePlugin({
env: 'ETCHER_UTIL_BIN_PATH',
path: `out/sidecar/bin/etcher-util${process.platform === 'win32' ? '.exe' : ''}`,
build: {
command: 'npm rebuild mountutils && tsc --project tsconfig.sidecar.json && pkg out/sidecar/util/api.js -c pkg-sidecar.json --target node18 --output out/sidecar/bin/etcher-util',
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';npm run make"
},
"husky": {
"hooks": {
Expand Down

0 comments on commit 6dac465

Please sign in to comment.