Skip to content

armgit / nota

Public Imported from GitHub
0

Nota — a free DAW for macOS, Windows and Linux. No subscription, no account — just open it and make music.

Fix Windows release build for the VS 2026 runner image

Egor Khindikaynen70dca058a991
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index debef759..41fea0b0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -88,13 +88,16 @@ jobs:
# --------------------------------------------------------------------------------
# Windows — x64 + arm64 installers, both cross-built from the x64 runner via the
- # Visual Studio generator. Requires the VS2022 ARM64 build tools (present on the
- # GitHub windows-latest image).
+ # Visual Studio generator (its -A flag targets ARM64 from an x64 host). Pinned to
+ # windows-2022 for a known VS 2022 toolchain with the ARM64 build tools: as of June
+ # 2026 windows-latest/windows-2025 ship Visual Studio 2026, which the script also
+ # supports (it auto-selects the newest installed VS), but the 2022 image is the
+ # verified combination for the ARM64 cross-build.
# --------------------------------------------------------------------------------
windows:
name: Build Windows (x64 + arm64)
needs: guard
- runs-on: windows-latest
+ runs-on: windows-2022
steps:
- uses: actions/checkout@v5
with:
diff --git a/scripts/package-win.ps1 b/scripts/package-win.ps1
index c472a173..e32b4a9b 100644
--- a/scripts/package-win.ps1
+++ b/scripts/package-win.ps1
@@ -1,10 +1,11 @@
# SPDX-License-Identifier: AGPL-3.0-only
#
# Package Nota for Windows: build the native engine, publish the self-contained
-# app, then build an Inno Setup installer (scripts/nota.iss). Uses the Visual
-# Studio generator so a single x64 host can cross-build both x64 and ARM64.
-# Run from a "Developer PowerShell for VS 2022" (native build needs the MSVC env);
-# the ARM64 target also needs the "MSVC v143 - ARM64 build tools" VS component.
+# app, then build an Inno Setup installer (scripts/nota.iss). Uses the (default,
+# newest-installed) Visual Studio generator so a single x64 host can cross-build both
+# x64 and ARM64 via its -A flag — works with VS 2022 or VS 2026.
+# Run from a "Developer PowerShell for VS" (native build needs the MSVC env); the
+# ARM64 target also needs that VS's "ARM64 build tools" component.
# Requires Inno Setup 6.3+ (iscc / ISCC.exe) for the installer.
#
# Usage: pwsh scripts/package-win.ps1 [x64|arm64] (default: x64)
@@ -24,7 +25,10 @@ $Native = "src/native/nota.engine/build-$Arch"
$PubDir = Join-Path (Get-Location) "dist/publish-$Arch"
Write-Host "==> Building native engine ($Arch / WASAPI)…"
-cmake -G "Visual Studio 17 2022" -A $CmakeArch -S src/native/nota.engine -B $Native
+# Let CMake pick the default (newest installed) Visual Studio generator instead of
+# hardcoding one — "Visual Studio 17 2022" fails on images that ship only VS 2026.
+# -A selects the target architecture; it is valid for any VS generator.
+cmake -A $CmakeArch -S src/native/nota.engine -B $Native
cmake --build $Native --config Release
# Locate the freshly built engine DLL. The VS (multi-config) generator usually writes