Add Windows Arm64 builds to CI (#40821)

Closes https://github.com/zed-industries/zed/issues/40378 Release Notes: - N/A --------- Co-authored-by: Julia Ryan <juliaryan3.14@gmail.com>
2026-06-01 03:14:56 +07:00 · 2025-10-21 17:51:54 -04:00 · 2025-10-21 17:51:54 -04:00 · 2bba3358b8
commit 2bba3358b8
parent fcecf379dc
4 changed files with 180 additions and 29 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -789,7 +789,7 @@ jobs:

  bundle-windows-x64:
    timeout-minutes: 120
-    name: Create a Windows installer
+    name: Create a Windows installer for x86_64
    runs-on: [self-32vcpu-windows-2022]
    if: |
      ( startsWith(github.ref, 'refs/tags/v')
@ -844,13 +844,70 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

+  bundle-windows-aarch64:
+    timeout-minutes: 120
+    name: Create a Windows installer for aarch64
+    runs-on: [self-32vcpu-windows-2022]
+    if: |
+      ( startsWith(github.ref, 'refs/tags/v')
+      || contains(github.event.pull_request.labels.*.name, 'run-bundling') )
+    needs: [windows_tests]
+    env:
+      AZURE_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }}
+      AZURE_CLIENT_ID: ${{ secrets.AZURE_SIGNING_CLIENT_ID }}
+      AZURE_CLIENT_SECRET: ${{ secrets.AZURE_SIGNING_CLIENT_SECRET }}
+      ACCOUNT_NAME: ${{ vars.AZURE_SIGNING_ACCOUNT_NAME }}
+      CERT_PROFILE_NAME: ${{ vars.AZURE_SIGNING_CERT_PROFILE_NAME }}
+      ENDPOINT: ${{ vars.AZURE_SIGNING_ENDPOINT }}
+      FILE_DIGEST: SHA256
+      TIMESTAMP_DIGEST: SHA256
+      TIMESTAMP_SERVER: "http://timestamp.acs.microsoft.com"
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          clean: false
+
+      - name: Setup Sentry CLI
+        uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b #v2
+        with:
+          token: ${{ SECRETS.SENTRY_AUTH_TOKEN }}
+
+      - name: Determine version and release channel
+        working-directory: ${{ env.ZED_WORKSPACE }}
+        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+        run: |
+          # This exports RELEASE_CHANNEL into env (GITHUB_ENV)
+          script/determine-release-channel.ps1
+
+      - name: Build Zed installer
+        working-directory: ${{ env.ZED_WORKSPACE }}
+        run: script/bundle-windows.ps1 -Architecture aarch64
+
+      - name: Upload installer (aarch64) to Workflow - zed (run-bundling)
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        if: contains(github.event.pull_request.labels.*.name, 'run-bundling')
+        with:
+          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}-aarch64.exe
+          path: ${{ env.SETUP_PATH }}
+
+      - name: Upload Artifacts to release
+        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
+        if: ${{ !(contains(github.event.pull_request.labels.*.name, 'run-bundling')) }}
+        with:
+          draft: true
+          prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
+          files: ${{ env.SETUP_PATH }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
  auto-release-preview:
    name: Auto release preview
    if: |
      false
      && startsWith(github.ref, 'refs/tags/v')
      && endsWith(github.ref, '-pre') && !endsWith(github.ref, '.0-pre')
-    needs: [bundle-mac, bundle-linux-x86_x64, bundle-linux-aarch64, bundle-windows-x64]
+    needs: [bundle-mac, bundle-linux-x86_x64, bundle-linux-aarch64, bundle-windows-x64, bundle-windows-aarch64]
    runs-on:
      - self-mini-macos
    steps:
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@ -246,7 +246,7 @@ jobs:

  bundle-windows-x64:
    timeout-minutes: 60
-    name: Create a Windows installer
+    name: Create a Windows installer for x86_64
    if: github.repository_owner == 'zed-industries'
    runs-on: [self-32vcpu-windows-2022]
    needs: windows-tests
@ -287,6 +287,49 @@ jobs:
        working-directory: ${{ env.ZED_WORKSPACE }}
        run: script/upload-nightly.ps1 windows

+  bundle-windows-arm64:
+    timeout-minutes: 60
+    name: Create a Windows installer for aarch64
+    if: github.repository_owner == 'zed-industries'
+    runs-on: [self-32vcpu-windows-2022]
+    needs: windows-tests
+    env:
+      AZURE_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }}
+      AZURE_CLIENT_ID: ${{ secrets.AZURE_SIGNING_CLIENT_ID }}
+      AZURE_CLIENT_SECRET: ${{ secrets.AZURE_SIGNING_CLIENT_SECRET }}
+      ACCOUNT_NAME: ${{ vars.AZURE_SIGNING_ACCOUNT_NAME }}
+      CERT_PROFILE_NAME: ${{ vars.AZURE_SIGNING_CERT_PROFILE_NAME }}
+      ENDPOINT: ${{ vars.AZURE_SIGNING_ENDPOINT }}
+      FILE_DIGEST: SHA256
+      TIMESTAMP_DIGEST: SHA256
+      TIMESTAMP_SERVER: "http://timestamp.acs.microsoft.com"
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          clean: false
+
+      - name: Set release channel to nightly
+        working-directory: ${{ env.ZED_WORKSPACE }}
+        run: |
+          $ErrorActionPreference = "Stop"
+          $version = git rev-parse --short HEAD
+          Write-Host "Publishing version: $version on release channel nightly"
+          "nightly" | Set-Content -Path "crates/zed/RELEASE_CHANNEL"
+
+      - name: Setup Sentry CLI
+        uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b #v2
+        with:
+          token: ${{ SECRETS.SENTRY_AUTH_TOKEN }}
+
+      - name: Build Zed installer
+        working-directory: ${{ env.ZED_WORKSPACE }}
+        run: script/bundle-windows.ps1 -Architecture aarch64
+
+      - name: Upload Zed Nightly
+        working-directory: ${{ env.ZED_WORKSPACE }}
+        run: script/upload-nightly.ps1 windows
+
  update-nightly-tag:
    name: Update nightly tag
    if: github.repository_owner == 'zed-industries'
@ -296,6 +339,7 @@ jobs:
      - bundle-linux-x86
      - bundle-linux-arm
      - bundle-windows-x64
+      - bundle-windows-arm64
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
--- a/crates/zed/resources/windows/zed.iss
+++ b/crates/zed/resources/windows/zed.iss
@ -31,7 +31,10 @@ WizardStyle=modern

 CloseApplications=force

+#ifdef DefaultSign
 SignTool=Defaultsign
+#endif
+
 DefaultDirName={autopf}\{#AppName}
 PrivilegesRequired=lowest

--- a/script/bundle-windows.ps1
+++ b/script/bundle-windows.ps1
@ -2,6 +2,7 @@
 Param(
    [Parameter()][Alias('i')][switch]$Install,
    [Parameter()][Alias('h')][switch]$Help,
+    [Parameter()][Alias('a')][string]$Architecture,
    [Parameter()][string]$Name
 )

@ -14,12 +15,44 @@ $PSNativeCommandUseErrorActionPreference = $true

 $buildSuccess = $false

+$OSArchitecture = switch ([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) {
+    "X64" { "x86_64" }
+    "Arm64" { "aarch64" }
+    default { throw "Unsupported architecture" }
+}
+
+$Architecture = if ($Architecture) {
+    $Architecture
+} else {
+    $OSArchitecture
+}
+
+$CargoOutDir = "./target/$Architecture-pc-windows-msvc/release"
+
+function Get-VSArch {
+    param(
+        [string]$Arch
+    )
+
+    switch ($Arch) {
+        "x86_64" { "amd64" }
+        "aarch64" { "arm64" }
+    }
+}
+
+Push-Location
+& "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1" -Arch (Get-VSArch -Arch $Architecture) -HostArch (Get-VSArch -Arch $OSArchitecture)
+Pop-Location
+
+$target = "$Architecture-pc-windows-msvc"
+
 if ($Help) {
    Write-Output "Usage: test.ps1 [-Install] [-Help]"
    Write-Output "Build the installer for Windows.\n"
    Write-Output "Options:"
-    Write-Output "  -Install, -i  Run the installer after building."
-    Write-Output "  -Help, -h     Show this help message."
+    Write-Output "  -Architecture, -a Which architecture to build (x86_64 or aarch64)"
+    Write-Output "  -Install, -i      Run the installer after building."
+    Write-Output "  -Help, -h         Show this help message."
    exit 0
 }

@ -30,6 +63,10 @@ $env:RELEASE_CHANNEL = $channel
 Pop-Location

 function CheckEnvironmentVariables {
+    if(-not $env:CI) {
+        return
+    }
+
    $requiredVars = @(
        'ZED_WORKSPACE', 'RELEASE_VERSION', 'ZED_RELEASE_CHANNEL',
        'AZURE_TENANT_ID', 'AZURE_CLIENT_ID', 'AZURE_CLIENT_SECRET',
@ -55,6 +92,8 @@ function PrepareForBundle {
    New-Item -Path "$innoDir\appx" -ItemType Directory -Force
    New-Item -Path "$innoDir\bin" -ItemType Directory -Force
    New-Item -Path "$innoDir\tools" -ItemType Directory -Force
+
+    rustup target add $target
 }

 function GenerateLicenses {
@ -67,34 +106,34 @@ function GenerateLicenses {
 function BuildZedAndItsFriends {
    Write-Output "Building Zed and its friends, for channel: $channel"
    # Build zed.exe, cli.exe and auto_update_helper.exe
-    cargo build --release --package zed --package cli --package auto_update_helper
-    Copy-Item -Path ".\target\release\zed.exe" -Destination "$innoDir\Zed.exe" -Force
-    Copy-Item -Path ".\target\release\cli.exe" -Destination "$innoDir\cli.exe" -Force
-    Copy-Item -Path ".\target\release\auto_update_helper.exe" -Destination "$innoDir\auto_update_helper.exe" -Force
+    cargo build --release --package zed --package cli --package auto_update_helper --target $target
+    Copy-Item -Path ".\$CargoOutDir\zed.exe" -Destination "$innoDir\Zed.exe" -Force
+    Copy-Item -Path ".\$CargoOutDir\cli.exe" -Destination "$innoDir\cli.exe" -Force
+    Copy-Item -Path ".\$CargoOutDir\auto_update_helper.exe" -Destination "$innoDir\auto_update_helper.exe" -Force
    # Build explorer_command_injector.dll
    switch ($channel) {
        "stable" {
-            cargo build --release --features stable --no-default-features --package explorer_command_injector
+            cargo build --release --features stable --no-default-features --package explorer_command_injector --target $target
        }
        "preview" {
-            cargo build --release --features preview --no-default-features --package explorer_command_injector
+            cargo build --release --features preview --no-default-features --package explorer_command_injector --target $target
        }
        default {
-            cargo build --release --package explorer_command_injector
+            cargo build --release --package explorer_command_injector --target $target
        }
    }
-    Copy-Item -Path ".\target\release\explorer_command_injector.dll" -Destination "$innoDir\zed_explorer_command_injector.dll" -Force
+    Copy-Item -Path ".\$CargoOutDir\explorer_command_injector.dll" -Destination "$innoDir\zed_explorer_command_injector.dll" -Force
 }

 function ZipZedAndItsFriendsDebug {
    $items = @(
-        ".\target\release\zed.pdb",
-        ".\target\release\cli.pdb",
-        ".\target\release\auto_update_helper.pdb",
-        ".\target\release\explorer_command_injector.pdb"
+        ".\$CargoOutDir\zed.pdb",
+        ".\$CargoOutDir\cli.pdb",
+        ".\$CargoOutDir\auto_update_helper.pdb",
+        ".\$CargoOutDir\explorer_command_injector.pdb"
    )

-    Compress-Archive -Path $items -DestinationPath ".\target\release\zed-$env:RELEASE_VERSION-$env:ZED_RELEASE_CHANNEL.dbg.zip" -Force
+    Compress-Archive -Path $items -DestinationPath ".\$CargoOutDir\zed-$env:RELEASE_VERSION-$env:ZED_RELEASE_CHANNEL.dbg.zip" -Force
 }


@ -109,7 +148,7 @@ function UploadToSentry {
        return
    }
    Write-Output "Uploading zed debug symbols to sentry..."
-    sentry-cli debug-files upload --include-sources --wait -p zed -o zed-dev .\target\release\
+    sentry-cli debug-files upload --include-sources --wait -p zed -o zed-dev $CargoOutDir
 }

 function MakeAppx {
@ -132,6 +171,10 @@ function MakeAppx {
 }

 function SignZedAndItsFriends {
+    if (-not $env:CI) {
+        return
+    }
+
    $files = "$innoDir\Zed.exe,$innoDir\cli.exe,$innoDir\auto_update_helper.exe,$innoDir\zed_explorer_command_injector.dll,$innoDir\zed_explorer_command_injector.appx"
    & "$innoDir\sign.ps1" $files
 }
@ -172,7 +215,7 @@ function BuildInstaller {
            $appIconName = "app-icon"
            $appName = "Zed"
            $appDisplayName = "Zed"
-            $appSetupName = "Zed-x86_64"
+            $appSetupName = "Zed-$Architecture"
            # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs
            $appMutex = "Zed-Stable-Instance-Mutex"
            $appExeName = "Zed"
@ -186,7 +229,7 @@ function BuildInstaller {
            $appIconName = "app-icon-preview"
            $appName = "Zed Preview"
            $appDisplayName = "Zed Preview"
-            $appSetupName = "Zed-x86_64"
+            $appSetupName = "Zed-$Architecture"
            # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs
            $appMutex = "Zed-Preview-Instance-Mutex"
            $appExeName = "Zed"
@ -200,7 +243,7 @@ function BuildInstaller {
            $appIconName = "app-icon-nightly"
            $appName = "Zed Nightly"
            $appDisplayName = "Zed Nightly"
-            $appSetupName = "Zed-x86_64"
+            $appSetupName = "Zed-$Architecture"
            # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs
            $appMutex = "Zed-Nightly-Instance-Mutex"
            $appExeName = "Zed"
@ -214,7 +257,7 @@ function BuildInstaller {
            $appIconName = "app-icon-dev"
            $appName = "Zed Dev"
            $appDisplayName = "Zed Dev"
-            $appSetupName = "Zed-x86_64"
+            $appSetupName = "Zed-$Architecture"
            # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs
            $appMutex = "Zed-Dev-Instance-Mutex"
            $appExeName = "Zed"
@ -252,14 +295,16 @@ function BuildInstaller {
        "AppxFullName"   = $appAppxFullName
    }

-    $signTool = "powershell.exe -ExecutionPolicy Bypass -File $innoDir\sign.ps1 `$f"
-
    $defs = @()
    foreach ($key in $definitions.Keys) {
        $defs += "/d$key=`"$($definitions[$key])`""
    }

-    $innoArgs = @($issFilePath) + $defs + "/sDefaultsign=`"$signTool`""
+    $innoArgs = @($issFilePath) + $defs
+    if($env:CI) {
+        $signTool = "powershell.exe -ExecutionPolicy Bypass -File $innoDir\sign.ps1 `$f"
+        $innoArgs += "/sDefaultsign=`"$signTool`""
+    }

    # Execute Inno Setup
    Write-Host "🚀 Running Inno Setup: $innoSetupPath $innoArgs"
@ -278,7 +323,7 @@ function BuildInstaller {

 ParseZedWorkspace
 $innoDir = "$env:ZED_WORKSPACE\inno"
-$debugArchive = ".\target\release\zed-$env:RELEASE_VERSION-$env:ZED_RELEASE_CHANNEL.dbg.zip"
+$debugArchive = "$CargoOutDir\zed-$env:RELEASE_VERSION-$env:ZED_RELEASE_CHANNEL.dbg.zip"
 $debugStoreKey = "$env:ZED_RELEASE_CHANNEL/zed-$env:RELEASE_VERSION-$env:ZED_RELEASE_CHANNEL.dbg.zip"

 CheckEnvironmentVariables
@ -293,8 +338,10 @@ DownloadConpty
 CollectFiles
 BuildInstaller

-UploadToBlobStorePublic -BucketName "zed-debug-symbols" -FileToUpload $debugArchive -BlobStoreKey $debugStoreKey
-UploadToSentry
+if($env:CI) {
+    UploadToBlobStorePublic -BucketName "zed-debug-symbols" -FileToUpload $debugArchive -BlobStoreKey $debugStoreKey
+    UploadToSentry
+}

 if ($buildSuccess) {
    Write-Output "Build successful"