Merge pull request #562 from dennisameling/native-arm64-sdk

Use new git-sdk-arm64 for aarch64

README.md

@@ -51,7 +51,7 @@ The supported flavors are:
 
 ### CPU architecture support
 
-Git for Windows SDK comes in variants targeting `x86_64` (AKA "64-bit") and `i686` (AKA 32-bit). The default is `x86_64` and can be overridden like this:
+Git for Windows SDK comes in variants targeting `x86_64` (AKA "64-bit"), `i686` (AKA 32-bit) and  `aarch64` (AKA arm64). The default is `x86_64` and can be overridden like this:
 
 ```yaml
 - uses: git-for-windows/setup-git-for-windows-sdk
@@ -60,9 +60,7 @@ Git for Windows SDK comes in variants targeting `x86_64` (AKA "64-bit") and `i68
     architecture: i686
 ```
 
-Please note that only the `build-installers` and the `full` flavors are available for `i686`.
-
-As a special case, the architecture `aarch64` (AKA "ARM64") is also handled, even if there is no SDK fully targeting Windows/ARM64 (due to missing Cygwin/MSYS support for that architecture); Selecting this architecture will install the `x86_64` flavor of Git for Windows' SDK and then add the MINGW toolchain targeting Windows/ARM64.
+Please note that only the `build-installers` and the `full` flavors are available for `i686`. For `aarch64`, only the `full` flavor is available.
 
 ### Verbosity
 

action.yml

@@ -11,7 +11,7 @@ inputs:
     default: 'minimal'
   architecture:
     required: false
-    description: 'The architecture of the SDK: x86_64, i686 or aarch64. Note that "aarch64" uses the x86_64 SDK, but adds "clangarm64" to the path.'
+    description: 'The architecture of the SDK: x86_64, i686 or aarch64. Note that "aarch64" only supports the "full" flavor for now.'
     default: 'x86_64'
   msys:
     required: false

main.ts

@@ -2,7 +2,7 @@ import * as core from '@actions/core'
 import {mkdirp} from './src/downloader'
 import {restoreCache, saveCache} from '@actions/cache'
 import process from 'process'
-import {spawn, spawnSync} from 'child_process'
+import {spawnSync} from 'child_process'
 import {
   getArtifactMetadata,
   getViaGit,
@@ -13,65 +13,6 @@ import * as fs from 'fs'
 const flavor = core.getInput('flavor')
 const architecture = core.getInput('architecture')
 
-async function installArm64Dependencies(
-  outputDirectory: string
-): Promise<void> {
-  if (flavor === 'minimal') {
-    throw new Error(`ARM64 not yet supported with flavor '${flavor}`)
-  }
-
-  mkdirp(`${outputDirectory}/clangarm64`)
-  fs.appendFileSync(
-    `${outputDirectory}/etc/pacman.conf`,
-    `
-    [clangarm64]
-    Server = https://mirror.msys2.org/mingw/clangarm64/`
-  )
-
-  const packages = [
-    'base-devel',
-    'mingw-w64-clang-aarch64-openssl',
-    'mingw-w64-clang-aarch64-zlib',
-    'mingw-w64-clang-aarch64-curl',
-    'mingw-w64-clang-aarch64-expat',
-    'mingw-w64-clang-aarch64-libiconv',
-    'mingw-w64-clang-aarch64-pcre2',
-    'mingw-w64-clang-aarch64-libssp'
-  ]
-  if (
-    flavor === 'full' ||
-    flavor === 'makepkg-git' ||
-    flavor === 'build-installers'
-  ) {
-    packages.push(
-      'mingw-w64-clang-aarch64-toolchain',
-      'mingw-w64-clang-aarch64-asciidoc'
-    )
-  }
-
-  const child = spawn('pacman.exe', ['-Sy', '--noconfirm', ...packages])
-
-  child.stdout.setEncoding('utf-8')
-  child.stderr.setEncoding('utf-8')
-
-  child.stdout.on('data', data => {
-    core.info(data)
-  })
-
-  child.stderr.on('data', data => {
-    core.error(data)
-  })
-
-  return new Promise((resolve, reject) => {
-    child.on('error', error => reject(error))
-    child.on('close', status =>
-      status === 0
-        ? resolve()
-        : reject(new Error(`Process exited with status code ${status}`))
-    )
-  })
-}
-
 async function run(): Promise<void> {
   try {
     if (process.platform !== 'win32') {
@@ -81,15 +22,19 @@ async function run(): Promise<void> {
       return
     }
 
-    const architectureToDownload =
-      architecture === 'aarch64' ? 'x86_64' : architecture
+    if (architecture === 'aarch64' && flavor !== 'full') {
+      throw new Error(
+        'On aarch64, only the "full" flavor is supported at this time.'
+      )
+    }
+
     const githubToken = core.getInput('github-token')
     const verbose = core.getInput('verbose')
     const msysMode = core.getInput('msys') === 'true'
 
     const {artifactName, download, id} = await getViaGit(
       flavor,
-      architectureToDownload,
+      architecture,
       githubToken
     )
     const outputDirectory = core.getInput('path') || `C:/${artifactName}`
@@ -154,12 +99,6 @@ async function run(): Promise<void> {
       `/${mingw.toLocaleLowerCase()}/bin`
     ]
 
-    if (architecture === 'aarch64') {
-      // Some binaries aren't available yet in the /clangarm64/bin folder, but Windows 11 ARM64
-      // has support for x64 emulation, so let's add /mingw64/bin as a fallback.
-      binPaths.splice(binPaths.length - 1, 0, '/mingw64/bin')
-    }
-
     for (const binPath of msysMode ? binPaths.reverse() : binPaths) {
       core.addPath(`${outputDirectory}${binPath}`)
     }
@@ -199,13 +138,6 @@ async function run(): Promise<void> {
     })) {
       ln(`/dev/${linkPath}`, `/proc/self/${target}`)
     }
-
-    if (msystem === 'CLANGARM64') {
-      // ARM64 dependencies aren't included yet in the Git for Windows SDK. Ask Pacman to install them.
-      core.startGroup(`Installing CLANGARM64 dependencies`)
-      await installArm64Dependencies(outputDirectory)
-      core.endGroup()
-    }
   } catch (error) {
     core.setFailed(error instanceof Error ? error.message : `${error}`)
   }

src/git.ts

@@ -30,7 +30,16 @@ export function getArtifactMetadata(
   architecture: string
 ): {bitness: string; repo: string; artifactName: string} {
   const bitness = architecture === 'i686' ? '32' : '64'
-  const repo = `git-sdk-${bitness}`
+  const repo = {
+    i686: 'git-sdk-32',
+    x86_64: 'git-sdk-64',
+    aarch64: 'git-sdk-arm64'
+  }[architecture]
+
+  if (repo === undefined) {
+    throw new Error(`Invalid architecture ${architecture} specified`)
+  }
+
   const artifactName = `${repo}-${flavor}`
 
   return {bitness, repo, artifactName}