From 032649eaeb8b52806406bc5fdcf45194c9c9e323 Mon Sep 17 00:00:00 2001 From: salman Date: Mon, 16 Nov 2026 17:09:31 +0100 Subject: [PATCH] Build Windows NSIS installer inside Wine container on CI --- .gitea/workflows/build-windows.yml | 14 ++++++-- packaging/wsl2/build-windows-ci.sh | 51 ++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) create mode 100755 packaging/wsl2/build-windows-ci.sh diff --git a/.gitea/workflows/build-windows.yml b/.gitea/workflows/build-windows.yml index 83452b3..7f65969 100644 --- a/.gitea/workflows/build-windows.yml +++ b/.gitea/workflows/build-windows.yml @@ -15,7 +15,7 @@ jobs: build-windows: if: ${{ gitea.event_name != 'push' || gitea.event.deleted != true }} runs-on: ubuntu-latest-full - timeout-minutes: 120 + timeout-minutes: 180 defaults: run: shell: bash @@ -26,6 +26,7 @@ jobs: GITEA_REF: ${{ gitea.ref }} PACKAGE_PLATFORM: windows ENGINE: podman + BUILDER_IMAGE_REQUEST: ${{ vars.TRIMSP_WINDOWS_BUILDER_IMAGE || 'docker.io/electronuserland/builder:wine' }} steps: - name: Check out TRIMSP uses: https://github.com/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -60,10 +61,19 @@ jobs: bash packaging/wsl2/build-wsl2.sh node packaging/wsl2/require-rootfs.js + - name: Resolve Windows builder image + run: | + set -euo pipefail + timeout --kill-after=5s 30s podman info + timeout --kill-after=10s 900s podman pull "$BUILDER_IMAGE_REQUEST" + builder=$(podman image inspect --format '{{index .RepoDigests 0}}' "$BUILDER_IMAGE_REQUEST") + [[ "$builder" =~ @sha256:[0-9a-f]{64}$ ]] + echo "WINDOWS_BUILDER_IMAGE=$builder" >> "$GITHUB_ENV" + - name: Build Windows NSIS installer run: | set -euo pipefail - npx --yes electron-builder@26.15.3 --win nsis --x64 --publish never + bash packaging/wsl2/build-windows-ci.sh - name: Collect Windows artifacts run: | diff --git a/packaging/wsl2/build-windows-ci.sh b/packaging/wsl2/build-windows-ci.sh new file mode 100755 index 0000000..df71440 --- /dev/null +++ b/packaging/wsl2/build-windows-ci.sh @@ -0,0 +1,51 @@ +#!/usr/bin/env bash +# Copyright (C) 2026 Zaher Salman +# SPDX-License-Identifier: GPL-3.0-or-later +# Build an unsigned NSIS installer on a Linux runner using a Wine-enabled image. +set -euo pipefail + +here="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source_dir="${SOURCE_DIR:-$(cd "$here/../.." && pwd)}" +builder="${WINDOWS_BUILDER_IMAGE:?Set WINDOWS_BUILDER_IMAGE to an image digest}" +engine="${ENGINE:-podman}" +out="${OUT_DIR:-$source_dir/dist}" +rootfs="${WSL_ROOTFS:-$source_dir/packaging/wsl2/out/trimspNL-runtime-rootfs.tar.gz}" + +[[ "$builder" =~ @sha256:[0-9a-f]{64}$ ]] || { echo 'Use a digest-pinned Windows builder image' >&2; exit 1; } +test -x "$source_dir/resources/bin/trimspNL" +test -s "$rootfs" +gzip -t "$rootfs" + +mkdir -p "$out" +out=$(cd "$out" && pwd) +stage=$(mktemp -d "${TMPDIR:-/tmp}/trimsp-win-stage.XXXXXX") +container_id="" +trap ' + if [ -n "$container_id" ]; then + "$engine" rm -f "$container_id" >/dev/null 2>&1 || true + fi + rm -rf "$stage" +' EXIT + +# Archive committed source only. +git -C "$source_dir" archive HEAD | tar -x -C "$stage" +mkdir -p "$stage/resources/bin" "$stage/packaging/wsl2/out" +cp "$source_dir/resources/bin/trimspNL" "$stage/resources/bin/trimspNL" +cp "$rootfs" "$stage/packaging/wsl2/out/trimspNL-runtime-rootfs.tar.gz" + +container_id=$("$engine" create --name "trimsp-windows-$$-$RANDOM" \ + --workdir /project -v "$stage:/project" \ + -e ELECTRON_SKIP_BINARY_DOWNLOAD=1 -e CSC_IDENTITY_AUTO_DISCOVERY=false \ + "$builder" bash -c ' + set -euo pipefail + node --version + wine --version + npm ci --no-audit --no-fund + npx --yes electron-builder@26.15.3 --win nsis --x64 --publish never + ') +"$engine" start -a "$container_id" + +installer="TRIMSP-NL-Workbench-Setup.exe" +test -s "$stage/dist/$installer" +cp "$stage/dist/$installer" "$out/" +echo "Windows installer prepared: $out/$installer"