ci: added windows ARM64 runners to tests (#389)

* ci: added windows ARM64 runners to tests

* fix: fixed windows arm64 toolchain detection

Author: soumyamahunt

.github/workflows/main.yml

@@ -346,7 +346,7 @@ jobs:
       COMPOSITE: ./.ref-download-test
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest, ubuntu-24.04-arm]
+        os: [ubuntu-latest, macos-latest, windows-latest, ubuntu-24.04-arm, windows-11-arm]
     steps:
     - name: Setup wrapper composite action at ${{ env.COMPOSITE }}
       uses: actions/github-script@v7

__tests__/installer/windows.test.ts

@@ -78,7 +78,7 @@ describe('windows toolchain installation verification', () => {
   it('tests setting up on ARM64 Windows 10', async () => {
     jest.spyOn(os, 'release').mockReturnValue('10.0.17063')
     const installer = new WindowsToolchainInstaller(toolchain)
-    expect(installer['vsRequirement']('aarch64').components).toStrictEqual([
+    expect(installer['vsRequirement']('arm64').components).toStrictEqual([
       'Microsoft.VisualStudio.Component.VC.Tools.ARM64',
       'Microsoft.VisualStudio.Component.Windows10SDK.17763'
     ])
@@ -118,7 +118,7 @@ describe('windows toolchain installation verification', () => {
       preventCaching: false
     }
     const installer = new WindowsToolchainInstaller(toolchain)
-    expect(installer['vsRequirement']('aarch64').components).toStrictEqual([
+    expect(installer['vsRequirement']('arm64').components).toStrictEqual([
       'Microsoft.VisualStudio.Component.VC.Tools.ARM64',
       'Microsoft.VisualStudio.Component.Windows11SDK.22000'
     ])

__tests__/snapshot/windows.test.ts

@@ -185,4 +185,22 @@ describe('fetch windows tool data based on options', () => {
     expect(tool.dir).toBe(name)
     expect(tool.branch).toBe('swiftwasm')
   })
+
+  it('fetches windows 11 arm64 latest swift 6.0.0 tool', async () => {
+    setos({os: 'win32', dist: 'Windows', release: '10.0.26100'})
+    jest.spyOn(os, 'arch').mockReturnValue('arm64')
+    const ver6_0_0 = ToolchainVersion.create('6.0.0', false)
+    const tool = await Platform.toolchain(ver6_0_0)
+    expect(tool).toBeTruthy()
+    const wTool = tool as WindowsToolchainSnapshot
+    expect(wTool.download).toBe('swift-6.0-RELEASE-windows10-arm64.exe')
+    expect(wTool.dir).toBe('swift-6.0-RELEASE')
+    expect(wTool.platform).toBe('windows10-arm64')
+    expect(wTool.branch).toBe('swift-6.0-release')
+    expect(wTool.download_signature).toBe(
+      'swift-6.0-RELEASE-windows10-arm64.exe.sig'
+    )
+    expect(wTool.docker).toBe('6.0-windowsservercore-ltsc2022')
+    expect(wTool.preventCaching).toBe(false)
+  })
 })

dist/index.js

@@ -31,7 +31,7 @@ export class WindowsToolchainInstaller extends VerifyingToolchainInstaller<Windo
     })
 
     const vsComponents = [
-      `Microsoft.VisualStudio.Component.VC.Tools.${arch == 'aarch64' ? 'ARM64' : 'x86.x64'}`,
+      `Microsoft.VisualStudio.Component.VC.Tools.${arch == 'arm64' ? 'ARM64' : 'x86.x64'}`,
       ...providedComponents
     ]
     if (!winsdkComponent) {

src/installer/windows/index.ts

@@ -28,19 +28,7 @@ declare module './base' {
 }
 
 Platform.currentPlatform = async () => {
-  let arch: string
-  switch (os.arch()) {
-    case 'x64':
-      arch = 'x86_64'
-      break
-    case 'arm64':
-      arch = 'aarch64'
-      break
-    default:
-      arch = os.arch()
-      break
-  }
-
+  const arch = os.arch()
   const _os: getos.Os = await new Promise((resolve, reject) => {
     getos((e, o) => {
       if (e) {

src/platform/index.ts

@@ -10,6 +10,24 @@ import {LinuxToolchainInstaller} from '../installer'
 import {MODULE_DIR} from '../const'
 
 export class LinuxPlatform extends VersionedPlatform<LinuxToolchainInstaller> {
+  constructor(
+    readonly name: string,
+    readonly version: number,
+    readonly arch: string
+  ) {
+    switch (arch) {
+      case 'x64':
+        arch = 'x86_64'
+        break
+      case 'arm64':
+        arch = 'aarch64'
+        break
+      default:
+        break
+    }
+    super(name, version, arch)
+  }
+
   protected get downloadExtension() {
     return 'tar.gz'
   }

src/platform/linux.ts

@@ -3,6 +3,21 @@ import {WindowsToolchainInstaller} from '../installer'
 import {WindowsToolchainSnapshot, ToolchainSnapshot} from '../snapshot'
 
 export class WindowsPlatform extends VersionedPlatform<WindowsToolchainInstaller> {
+  constructor(
+    readonly name: string,
+    readonly version: number,
+    readonly arch: string
+  ) {
+    switch (arch) {
+      case 'x64':
+        arch = 'x86_64'
+        break
+      default:
+        break
+    }
+    super(name, version, arch)
+  }
+
   protected get downloadExtension() {
     return 'exe'
   }

src/platform/windows.ts

@@ -6,6 +6,16 @@ import {XcodeToolchainInstaller} from '../installer'
 
 export class XcodePlatform extends Platform<XcodeToolchainInstaller> {
   constructor(readonly arch: string) {
+    switch (arch) {
+      case 'x64':
+        arch = 'x86_64'
+        break
+      case 'arm64':
+        arch = 'aarch64'
+        break
+      default:
+        break
+    }
     super()
   }
 

src/platform/xcode.ts

@@ -2,4 +2,5 @@ import {SignedToolchainSnapshot} from './signed'
 
 export interface WindowsToolchainSnapshot extends SignedToolchainSnapshot {
   readonly windows: boolean
+  readonly docker?: string
 }