sadds

.github/actions/publish/action.yml

@@ -106,43 +106,10 @@ runs:
       shell: bash --noprofile --norc -eo pipefail -x {0}
       run: |
         set -ea
-
-        [[ '${{ inputs.VERBOSE }}' =~ on|On|Yes|yes|true|True ]] && set -x
-
-        runner_os="$(echo "${RUNNER_OS}" | tr '[:upper:]' '[:lower:]')"
-
+        ./build/make-all.sh
         APPLICATION_VERSION="$(jq -r '.version' package.json)"
-
-        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
-
         echo "version=${APPLICATION_VERSION}" >> $GITHUB_OUTPUT
 
-        # collect all artifacts from subdirectories under a common top-level directory
-        mkdir -p dist
-        find ./out/make -type f \( \
-          -iname "*.zip" -o        \
-          -iname "*.dmg" -o        \
-          -iname "*.rpm" -o        \
-          -iname "*.deb" -o        \
-          -iname "*.AppImage" -o   \
-          -iname "*Setup.exe"      \
-        \) -ls -exec cp '{}' dist/ \;
-
       env:
         # ensure we sign the artifacts
         NODE_ENV: production

.github/actions/test/action.yml

@@ -52,10 +52,8 @@ runs:
       shell: bash --noprofile --norc -eo pipefail -x {0}
       run: |
         set -ea
-        runner_os="$(echo "${RUNNER_OS}" | tr '[:upper:]' '[:lower:]')"
         npm ci
-        npm run package
-        npm run test-${runner_os}
+        ./build/test-all.sh
       env:
         # https://www.electronjs.org/docs/latest/api/environment-variables
         ELECTRON_NO_ATTACH_CONSOLE: 'true'

build/make-all.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+set -ea
+
+if [[ "$VERBOSE" =~ 1|on|On|Yes|yes|true|True ]]; then
+  set +x
+  export DEBUG='electron-forge:*,electron-packager,electron-rebuild'
+fi
+
+case "$(uname -s)" in
+  "Linux")
+    npm run make -- --arch=x64
+    ;;
+  "Darwin")
+    npm run make -- --arch=x64,arm64
+    ;;
+  "Windows"*|"MINGW"*|"MSYS"*)
+    # Plain `npm run make` fails on windows but seems to work when invoked via powershell.
+    # However, it does *not* work when powershell is invoked from here, and I can't be
+    # bothered to dig deeper. It is what it is.
+    # The failure has to do with node-gyp failing to find the node to build against.
+    # FIXME: figure out how to conditionally pass $DEBUG to powershell
+    npm run _make-all-windows
+    ;;
+esac
+
+# collect all artifacts from subdirectories under a common top-level directory
+mkdir -p dist
+find ./out/make -type f \( \
+  -iname "*.zip" -o        \
+  -iname "*.dmg" -o        \
+  -iname "*.rpm" -o        \
+  -iname "*.deb" -o        \
+  -iname "*.AppImage" -o   \
+  -iname "*Setup.exe"      \
+\) -ls -exec cp '{}' dist/ \;

build/test-all.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+set -ea
+
+if [[ "$VERBOSE" =~ 1|on|On|Yes|yes|true|True ]]; then
+  set +x
+  export DEBUG='electron-forge:*,electron-packager,electron-rebuild'
+fi
+
+npm run package
+npm run lint
+
+case "$(uname -s)" in
+  "Linux")
+    xvfb-run --auto-servernum npm run test-gui && xvfb-run --auto-servernum npm run test-shared
+    ;;
+  "Darwin")
+    npm run test-gui && npm run test-shared
+    ;;
+  "Windows"*|"MINGW"*|"MSYS"*)
+    npm run test-gui && npm run test-shared
+    ;;
+esac

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/',
       },
     }),
+    */
   ],
 };
 

package.json

@@ -14,15 +14,13 @@
     "url": "[email protected]:balena-io/etcher.git"
   },
   "scripts": {
+    "_make-all-windows": "@powershell -Command 'npm run make -- --arch=ia32,x64'",
     "lint-css": "prettier --write lib/**/*.css",
     "lint-ts": "balena-lint --fix --typescript typings lib tests webpack.config.ts",
     "lint": "npm run lint-ts && npm run lint-css",
     "test-gui": "electron-mocha --recursive --reporter spec --window-config tests/gui/window-config.json --require ts-node/register/transpile-only --require-main tests/gui/allow-renderer-process-reuse.ts --full-trace --no-sandbox --renderer tests/gui/**/*.ts",
     "test-shared": "electron-mocha --recursive --reporter spec --require ts-node/register/transpile-only --require-main tests/gui/allow-renderer-process-reuse.ts --full-trace --no-sandbox tests/shared/**/*.ts",
-    "test-windows": "npm run lint && npm run test-gui && npm run test-shared",
-    "test-macos": "npm run lint && npm run test-gui && npm run test-shared",
-    "test-linux": "npm run lint && xvfb-run --auto-servernum npm run test-gui && xvfb-run --auto-servernum npm run test-shared",
-    "test": "echo npm run test-{linux,windows,macos}",
+    "test": "build/test-all.sh",
     "package": "electron-forge package",
     "start": "electron-forge start",
     "make": "electron-forge make"