From 6aad3c6865cbd4c4a789d22fe1ebb4d8b1bdf799 Mon Sep 17 00:00:00 2001 From: Dariel Dato-on <80038+oddrationale@users.noreply.github.com> Date: Wed, 12 Nov 2025 13:20:50 -0600 Subject: [PATCH 01/12] Add support for ARM64 Windows in build and release workflows --- .github/workflows/build-test.yml | 3 +++ .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 6a40e825f4..2e61fa3bec 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -25,6 +25,9 @@ jobs: - platform: "windows-latest" args: "" target: "x86_64-pc-windows-msvc" + - platform: "windows-latest" # for ARM64 Windows + args: "--target aarch64-pc-windows-msvc" + target: "aarch64-pc-windows-msvc" uses: ./.github/workflows/build.yml with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9192cb58e..3b906a7203 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -142,7 +142,7 @@ jobs: run: bun install - name: rustup install target - if: ${{ inputs.target != '' && !contains(inputs.target, 'unknown-linux-gnu') && !contains(inputs.target, 'pc-windows-msvc') }} + if: ${{ inputs.target != '' && !contains(inputs.target, 'unknown-linux-gnu') && !contains(inputs.target, 'x86_64-pc-windows-msvc') }} run: rustup target add ${{ inputs.target }} - name: import Apple Developer Certificate diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1a9abec74a..c0dc7a9e68 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,6 +61,9 @@ jobs: - platform: "windows-latest" args: "" target: "x86_64-pc-windows-msvc" + - platform: "windows-latest" # for ARM64 Windows + args: "--target aarch64-pc-windows-msvc" + target: "aarch64-pc-windows-msvc" uses: ./.github/workflows/build.yml with: From fed0ea4e57ea81aae31d52a705e69c16f81df62a Mon Sep 17 00:00:00 2001 From: Dariel Dato-on <80038+oddrationale@users.noreply.github.com> Date: Fri, 14 Nov 2025 09:18:32 -0600 Subject: [PATCH 02/12] Update workflows to use 'windows-11-arm' for ARM64 Windows support --- .github/workflows/build-test.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 2e61fa3bec..434775c641 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -25,7 +25,7 @@ jobs: - platform: "windows-latest" args: "" target: "x86_64-pc-windows-msvc" - - platform: "windows-latest" # for ARM64 Windows + - platform: "windows-11-arm" # for ARM64 Windows runner args: "--target aarch64-pc-windows-msvc" target: "aarch64-pc-windows-msvc" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c0dc7a9e68..88b0d2ef9e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,7 +61,7 @@ jobs: - platform: "windows-latest" args: "" target: "x86_64-pc-windows-msvc" - - platform: "windows-latest" # for ARM64 Windows + - platform: "windows-11-arm" # for ARM64 Windows runner args: "--target aarch64-pc-windows-msvc" target: "aarch64-pc-windows-msvc" From 7ebd1d7be19881ae3288692428e1bca5b58f16e0 Mon Sep 17 00:00:00 2001 From: Dariel Dato-on <80038+oddrationale@users.noreply.github.com> Date: Fri, 14 Nov 2025 10:34:16 -0600 Subject: [PATCH 03/12] Use Bun baseline on Windows ARM builds --- .github/workflows/build.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3b906a7203..684f8157d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,7 +77,17 @@ jobs: echo "Build profile: release" fi - - uses: oven-sh/setup-bun@v2 + - name: Setup Bun (standard) + if: ${{ !(contains(inputs.platform, 'windows') && contains(inputs.target, 'aarch64')) }} + uses: oven-sh/setup-bun@v2 + + # Bun does not fully support Windows ARM64 yet, so we pin the baseline build. + # See https://github.com/oven-sh/bun/issues/9824 for details. + - name: Setup Bun (Windows ARM64 baseline) + if: ${{ contains(inputs.platform, 'windows') && contains(inputs.target, 'aarch64') }} + uses: oven-sh/setup-bun@v2 + with: + bun-download-url: "https://github.com/oven-sh/bun/releases/latest/download/bun-windows-x64-baseline.zip" - name: install Rust stable uses: dtolnay/rust-toolchain@stable From 5d65ef8e5bcd62a227ca7d5c3f4651dc33af07bb Mon Sep 17 00:00:00 2001 From: Dariel Dato-on <80038+oddrationale@users.noreply.github.com> Date: Fri, 14 Nov 2025 11:00:46 -0600 Subject: [PATCH 04/12] Add support for installing frontend dependencies on Windows ARM64 --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 684f8157d4..e9219e814d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,8 +149,13 @@ jobs: sudo apt-get install -y mesa-vulkan-drivers - name: install frontend dependencies + if: ${{ !(contains(inputs.platform, 'windows') && contains(inputs.target, 'aarch64')) }} run: bun install + - name: install frontend dependencies (Windows ARM64) + if: ${{ contains(inputs.platform, 'windows') && contains(inputs.target, 'aarch64') }} + run: bun install --cpu=arm64 + - name: rustup install target if: ${{ inputs.target != '' && !contains(inputs.target, 'unknown-linux-gnu') && !contains(inputs.target, 'x86_64-pc-windows-msvc') }} run: rustup target add ${{ inputs.target }} From 78d27a1aa92ebae8fe700c66ba4daa7ed8a1d677 Mon Sep 17 00:00:00 2001 From: Dariel Dato-on <80038+oddrationale@users.noreply.github.com> Date: Fri, 14 Nov 2025 12:04:45 -0600 Subject: [PATCH 05/12] Add Vulkan SDK installation steps for Windows ARM64 support --- .github/workflows/build.yml | 43 +++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e9219e814d..f9890e1c4f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -119,13 +119,52 @@ jobs: sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libasound2-dev libopenblas-dev libx11-dev libxtst-dev libxrandr-dev - - name: Install Vulkan SDK (Windows) - if: contains(inputs.platform, 'windows') + - name: Install Vulkan SDK (Windows x64) + if: contains(inputs.platform, 'windows') && !contains(inputs.target, 'aarch64') uses: humbletim/install-vulkan-sdk@v1.2 with: version: 1.4.309.0 cache: true + # humbletim/install-vulkan-sdk@v1.2 cannot target Windows ARM64 yet. + # See https://github.com/humbletim/install-vulkan-sdk/pull/22 – once merged we can switch back. + - name: Prepare Vulkan SDK env (Windows ARM64) + if: contains(inputs.platform, 'windows') && contains(inputs.target, 'aarch64') + shell: pwsh + run: | + $sdkDir = Join-Path $env:GITHUB_WORKSPACE "VULKAN_SDK" + New-Item -ItemType Directory -Force -Path $sdkDir | Out-Null + Add-Content -Path $env:GITHUB_ENV -Value "VULKAN_SDK=$sdkDir" + Add-Content -Path $env:GITHUB_ENV -Value "VULKAN_SDK_VERSION=1.4.309.0" + Add-Content -Path $env:GITHUB_ENV -Value "VULKAN_SDK_PLATFORM=windows" + + - name: Download Vulkan SDK (Windows ARM64) + if: contains(inputs.platform, 'windows') && contains(inputs.target, 'aarch64') + shell: pwsh + run: | + $url = "https://sdk.lunarg.com/sdk/download/1.4.309.0/warm/InstallVulkanARM64-1.4.309.0.exe" + $outFile = "vulkan_sdk_arm.exe" + if (-not (Test-Path $outFile)) { + Write-Host "Downloading Vulkan SDK from $url" + Invoke-WebRequest -Uri $url -OutFile $outFile + } else { + Write-Host "Using cached installer $outFile" + } + + - name: Install Vulkan SDK (Windows ARM64) + if: contains(inputs.platform, 'windows') && contains(inputs.target, 'aarch64') + shell: pwsh + run: | + $sdkDir = $env:VULKAN_SDK + if (-not $sdkDir) { + throw "VULKAN_SDK is not set" + } + $sevenZip = (Get-Command 7z.exe -ErrorAction Stop).Source + & $sevenZip x "./vulkan_sdk_arm.exe" "-o$sdkDir" -aoa + $binPath = Join-Path $sdkDir "Bin" + Add-Content -Path $env:GITHUB_PATH -Value $binPath + & (Join-Path $binPath "glslangValidator.exe") --version + - name: Install trusted-signing-cli if: contains(inputs.platform, 'windows') && inputs.sign-binaries run: cargo install trusted-signing-cli From b5cbc6e2fe20029af07d395c468d8ab69bc6e3be Mon Sep 17 00:00:00 2001 From: Dariel Dato-on <80038+oddrationale@users.noreply.github.com> Date: Fri, 14 Nov 2025 13:07:34 -0600 Subject: [PATCH 06/12] Refactor Vulkan SDK installation for Windows ARM64 to build from source --- .github/workflows/build.yml | 44 +++++++------------------------------ 1 file changed, 8 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9890e1c4f..0857ffa90b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -127,43 +127,15 @@ jobs: cache: true # humbletim/install-vulkan-sdk@v1.2 cannot target Windows ARM64 yet. - # See https://github.com/humbletim/install-vulkan-sdk/pull/22 – once merged we can switch back. - - name: Prepare Vulkan SDK env (Windows ARM64) + # The ARM64 installer only contains binaries, not headers/libs, so we build from source instead. + # See https://github.com/humbletim/install-vulkan-sdk/pull/22 for prebuilt ARM64 support progress. + - name: Build Vulkan SDK components (Windows ARM64) if: contains(inputs.platform, 'windows') && contains(inputs.target, 'aarch64') - shell: pwsh - run: | - $sdkDir = Join-Path $env:GITHUB_WORKSPACE "VULKAN_SDK" - New-Item -ItemType Directory -Force -Path $sdkDir | Out-Null - Add-Content -Path $env:GITHUB_ENV -Value "VULKAN_SDK=$sdkDir" - Add-Content -Path $env:GITHUB_ENV -Value "VULKAN_SDK_VERSION=1.4.309.0" - Add-Content -Path $env:GITHUB_ENV -Value "VULKAN_SDK_PLATFORM=windows" - - - name: Download Vulkan SDK (Windows ARM64) - if: contains(inputs.platform, 'windows') && contains(inputs.target, 'aarch64') - shell: pwsh - run: | - $url = "https://sdk.lunarg.com/sdk/download/1.4.309.0/warm/InstallVulkanARM64-1.4.309.0.exe" - $outFile = "vulkan_sdk_arm.exe" - if (-not (Test-Path $outFile)) { - Write-Host "Downloading Vulkan SDK from $url" - Invoke-WebRequest -Uri $url -OutFile $outFile - } else { - Write-Host "Using cached installer $outFile" - } - - - name: Install Vulkan SDK (Windows ARM64) - if: contains(inputs.platform, 'windows') && contains(inputs.target, 'aarch64') - shell: pwsh - run: | - $sdkDir = $env:VULKAN_SDK - if (-not $sdkDir) { - throw "VULKAN_SDK is not set" - } - $sevenZip = (Get-Command 7z.exe -ErrorAction Stop).Source - & $sevenZip x "./vulkan_sdk_arm.exe" "-o$sdkDir" -aoa - $binPath = Join-Path $sdkDir "Bin" - Add-Content -Path $env:GITHUB_PATH -Value $binPath - & (Join-Path $binPath "glslangValidator.exe") --version + uses: humbletim/setup-vulkan-sdk@v1.2.1 + with: + vulkan-query-version: 1.4.309.0 + vulkan-components: Vulkan-Headers, Vulkan-Loader + vulkan-use-cache: true - name: Install trusted-signing-cli if: contains(inputs.platform, 'windows') && inputs.sign-binaries From 9a601686dae5aa63e041be3b969f18bff10ce301 Mon Sep 17 00:00:00 2001 From: Dariel Dato-on <80038+oddrationale@users.noreply.github.com> Date: Fri, 14 Nov 2025 13:28:25 -0600 Subject: [PATCH 07/12] Add Glslang to Vulkan SDK components for Windows ARM64 build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0857ffa90b..44dcd0ae09 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -134,7 +134,7 @@ jobs: uses: humbletim/setup-vulkan-sdk@v1.2.1 with: vulkan-query-version: 1.4.309.0 - vulkan-components: Vulkan-Headers, Vulkan-Loader + vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang vulkan-use-cache: true - name: Install trusted-signing-cli From 88e1af604a9fd95cf979851aedd7b47c756f8e45 Mon Sep 17 00:00:00 2001 From: Dariel Dato-on <80038+oddrationale@users.noreply.github.com> Date: Fri, 14 Nov 2025 13:36:08 -0600 Subject: [PATCH 08/12] Add SPIRV-Headers and SPIRV-Tools to Vulkan SDK components for Windows ARM64 build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 44dcd0ae09..e17880f26e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -134,7 +134,7 @@ jobs: uses: humbletim/setup-vulkan-sdk@v1.2.1 with: vulkan-query-version: 1.4.309.0 - vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang + vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Headers, SPIRV-Tools, Glslang vulkan-use-cache: true - name: Install trusted-signing-cli From 4a1e9432d4eda434acb08f5e9b915e3019ae8ec1 Mon Sep 17 00:00:00 2001 From: Dariel Dato-on <80038+oddrationale@users.noreply.github.com> Date: Fri, 14 Nov 2025 14:13:47 -0600 Subject: [PATCH 09/12] Add Vulkan SDK preparation and binary download steps for Windows ARM64 --- .github/workflows/build.yml | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e17880f26e..24a196be43 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -127,14 +127,44 @@ jobs: cache: true # humbletim/install-vulkan-sdk@v1.2 cannot target Windows ARM64 yet. - # The ARM64 installer only contains binaries, not headers/libs, so we build from source instead. + # Download prebuilt binaries (Bin) + build headers/libs from source. # See https://github.com/humbletim/install-vulkan-sdk/pull/22 for prebuilt ARM64 support progress. - - name: Build Vulkan SDK components (Windows ARM64) + - name: Prepare Vulkan SDK env (Windows ARM64) + if: contains(inputs.platform, 'windows') && contains(inputs.target, 'aarch64') + shell: pwsh + run: | + $sdkDir = Join-Path $env:GITHUB_WORKSPACE "VULKAN_SDK" + New-Item -ItemType Directory -Force -Path $sdkDir | Out-Null + Add-Content -Path $env:GITHUB_ENV -Value "VULKAN_SDK=$sdkDir" + + - name: Download Vulkan SDK binaries (Windows ARM64) + if: contains(inputs.platform, 'windows') && contains(inputs.target, 'aarch64') + shell: pwsh + run: | + $url = "https://sdk.lunarg.com/sdk/download/1.4.309.0/warm/InstallVulkanARM64-1.4.309.0.exe" + $outFile = "vulkan_sdk_arm.exe" + Write-Host "Downloading Vulkan SDK binaries from $url" + Invoke-WebRequest -Uri $url -OutFile $outFile + + - name: Extract Vulkan SDK binaries (Windows ARM64) + if: contains(inputs.platform, 'windows') && contains(inputs.target, 'aarch64') + shell: pwsh + run: | + $sdkDir = $env:VULKAN_SDK + $sevenZip = (Get-Command 7z.exe -ErrorAction Stop).Source + Write-Host "Extracting binaries to $sdkDir" + & $sevenZip x "./vulkan_sdk_arm.exe" "-o$sdkDir" -aoa + $binPath = Join-Path $sdkDir "Bin" + Add-Content -Path $env:GITHUB_PATH -Value $binPath + Write-Host "Verifying glslc..." + & (Join-Path $binPath "glslc.exe") --version + + - name: Build Vulkan SDK headers and libs (Windows ARM64) if: contains(inputs.platform, 'windows') && contains(inputs.target, 'aarch64') uses: humbletim/setup-vulkan-sdk@v1.2.1 with: vulkan-query-version: 1.4.309.0 - vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Headers, SPIRV-Tools, Glslang + vulkan-components: Vulkan-Headers, Vulkan-Loader vulkan-use-cache: true - name: Install trusted-signing-cli From 40a364f0a931fb8d0c2a0ae070ff54c8f42600d4 Mon Sep 17 00:00:00 2001 From: Dariel Dato-on <80038+oddrationale@users.noreply.github.com> Date: Fri, 14 Nov 2025 16:37:12 -0600 Subject: [PATCH 10/12] Fix artifact paths in build workflow for target-specific output --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 24a196be43..3bb6e74712 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -341,6 +341,6 @@ jobs: with: name: ${{ inputs.asset-prefix }}-${{ inputs.target }} path: | - src-tauri/target/${{ steps.build-profile.outputs.profile }}/bundle/msi/*.msi - src-tauri/target/${{ steps.build-profile.outputs.profile }}/bundle/nsis/*.exe + src-tauri/target/${{ inputs.target }}/${{ steps.build-profile.outputs.profile }}/bundle/msi/*.msi + src-tauri/target/${{ inputs.target }}/${{ steps.build-profile.outputs.profile }}/bundle/nsis/*.exe retention-days: 30 From 59ff97e46a69ee4a28efb2fa7584f4e6aa05aa77 Mon Sep 17 00:00:00 2001 From: Dariel Dato-on <80038+oddrationale@users.noreply.github.com> Date: Fri, 14 Nov 2025 17:07:26 -0600 Subject: [PATCH 11/12] Fix artifact upload paths for cross-compilation on Windows ARM64 --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3bb6e74712..8553319afc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -340,7 +340,9 @@ jobs: uses: actions/upload-artifact@v4 with: name: ${{ inputs.asset-prefix }}-${{ inputs.target }} + # Default Windows builds place bundles under release/, but cross-compiles (ARM64) nest under target//release. + # This ternary keeps x86_64 uploads working while pointing cross-builds at their nested bundle directory. path: | - src-tauri/target/${{ inputs.target }}/${{ steps.build-profile.outputs.profile }}/bundle/msi/*.msi - src-tauri/target/${{ inputs.target }}/${{ steps.build-profile.outputs.profile }}/bundle/nsis/*.exe + src-tauri/target/${{ inputs.target != '' && inputs.target != 'x86_64-pc-windows-msvc' ? format('{0}/{1}', inputs.target, steps.build-profile.outputs.profile) : steps.build-profile.outputs.profile }}/bundle/msi/*.msi + src-tauri/target/${{ inputs.target != '' && inputs.target != 'x86_64-pc-windows-msvc' ? format('{0}/{1}', inputs.target, steps.build-profile.outputs.profile) : steps.build-profile.outputs.profile }}/bundle/nsis/*.exe retention-days: 30 From 2999779f5db75c8fb10b3c591b3f65b9894a9c50 Mon Sep 17 00:00:00 2001 From: Dariel Dato-on <80038+oddrationale@users.noreply.github.com> Date: Fri, 14 Nov 2025 17:10:28 -0600 Subject: [PATCH 12/12] Fix artifact upload paths for cross-compilation on Windows ARM64 --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8553319afc..cf5f48847c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -341,8 +341,7 @@ jobs: with: name: ${{ inputs.asset-prefix }}-${{ inputs.target }} # Default Windows builds place bundles under release/, but cross-compiles (ARM64) nest under target//release. - # This ternary keeps x86_64 uploads working while pointing cross-builds at their nested bundle directory. path: | - src-tauri/target/${{ inputs.target != '' && inputs.target != 'x86_64-pc-windows-msvc' ? format('{0}/{1}', inputs.target, steps.build-profile.outputs.profile) : steps.build-profile.outputs.profile }}/bundle/msi/*.msi - src-tauri/target/${{ inputs.target != '' && inputs.target != 'x86_64-pc-windows-msvc' ? format('{0}/{1}', inputs.target, steps.build-profile.outputs.profile) : steps.build-profile.outputs.profile }}/bundle/nsis/*.exe + src-tauri/target/${{ inputs.target != '' && inputs.target != 'x86_64-pc-windows-msvc' && format('{0}/{1}', inputs.target, steps.build-profile.outputs.profile) || steps.build-profile.outputs.profile }}/bundle/msi/*.msi + src-tauri/target/${{ inputs.target != '' && inputs.target != 'x86_64-pc-windows-msvc' && format('{0}/{1}', inputs.target, steps.build-profile.outputs.profile) || steps.build-profile.outputs.profile }}/bundle/nsis/*.exe retention-days: 30