Add ARM64/aarch64 support, add cleanup logic

Author: dennisameling

action.yml

@@ -11,7 +11,7 @@ inputs:
     default: 'minimal'
   architecture:
     required: false
-    description: 'The architecture of the SDK: x86_64 or i686'
+    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.'
     default: 'x86_64'
   msys:
     required: false
@@ -32,3 +32,4 @@ inputs:
 runs:
   using: 'node16'
   main: 'dist/index.js'
+  post: 'dist/index.js'

dist/index.js

@@ -2,8 +2,14 @@ import * as core from '@actions/core'
 import {mkdirp} from './src/downloader'
 import {restoreCache, saveCache} from '@actions/cache'
 import process from 'process'
-import {spawnSync} from 'child_process'
-import {getViaGit} from './src/git'
+import {spawn, spawnSync} from 'child_process'
+import {getArtifactMetadata, getViaGit} from './src/git'
+import * as fs from 'fs'
+
+const flavor = core.getInput('flavor')
+const architecture = core.getInput('architecture')
+const architectureToDownload =
+  architecture === 'aarch64' ? 'x86_64' : architecture
 
 async function run(): Promise<void> {
   try {
@@ -13,12 +19,14 @@ async function run(): Promise<void> {
       )
       return
     }
-    const flavor = core.getInput('flavor')
-    const architecture = core.getInput('architecture')
+
     const verbose = core.getInput('verbose')
     const msysMode = core.getInput('msys') === 'true'
 
-    const {artifactName, download, id} = await getViaGit(flavor, architecture)
+    const {artifactName, download, id} = await getViaGit(
+      flavor,
+      architectureToDownload
+    )
     const outputDirectory = core.getInput('path') || `C:/${artifactName}`
     let useCache: boolean
     switch (core.getInput('cache')) {
@@ -61,7 +69,22 @@ async function run(): Promise<void> {
       }
     }
 
-    const mingw = architecture === 'i686' ? 'MINGW32' : 'MINGW64'
+    let mingw = ''
+
+    switch (architecture) {
+      case 'i686':
+        mingw = 'MINGW32'
+        break
+      case 'x86_64':
+        mingw = 'MINGW64'
+        break
+      case 'aarch64':
+        mingw = 'CLANGARM64'
+        break
+      default:
+        core.setFailed(`Invalid architecture ${architecture} specified`)
+    }
+
     const msystem = msysMode ? 'MSYS' : mingw
 
     const binPaths = [
@@ -109,9 +132,72 @@ 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.
+      await installArm64Dependencies(outputDirectory)
+    }
   } catch (error) {
     core.setFailed(error instanceof Error ? error.message : `${error}`)
   }
 }
 
-run()
+async function installArm64Dependencies(
+  outputDirectory: string
+): Promise<void> {
+  core.info('Installing CLANGARM64 dependencies...')
+  mkdirp(`${outputDirectory}/clangarm64`)
+  fs.appendFileSync(
+    `${outputDirectory}/etc/pacman.conf`,
+    `
+    [clangarm64]
+    Server = https://mirror.msys2.org/mingw/clangarm64/`
+  )
+
+  const child = spawn('pacman.exe', [
+    '-Sy',
+    '--noconfirm',
+    '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-toolchain',
+    'mingw-w64-clang-aarch64-pcre2',
+    'mingw-w64-clang-aarch64-libssp'
+  ])
+
+  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}`))
+    )
+  })
+}
+
+function cleanup(): void {
+  const {artifactName} = getArtifactMetadata(flavor, architectureToDownload)
+  const outputDirectory = core.getInput('path') || `C:/${artifactName}`
+
+  core.info(`Cleaning up ${outputDirectory}...`)
+  fs.rmSync(outputDirectory, {recursive: true, force: true})
+  core.info(`Finished cleaning up ${outputDirectory}.`)
+}
+
+// If the POST action is running, we cleanup our artifacts
+if (process.env['STATE_isPost']) {
+  cleanup()
+} else {
+  run()
+}

dist/index.js.map

@@ -17,6 +17,18 @@ const gitExePath = 'C:/Program Files/Git/cmd/git.exe'
  * is much faster than, say, using only 2 workers.
  */
 const GIT_CONFIG_PARAMETERS = `'checkout.workers=56'`
+const REPO_OWNER = 'git-for-windows'
+
+export function getArtifactMetadata(
+  flavor: string,
+  architecture: string
+): {bitness: string; repo: string; artifactName: string} {
+  const bitness = architecture === 'i686' ? '32' : '64'
+  const repo = `git-sdk-${bitness}`
+  const artifactName = `${repo}-${flavor}`
+
+  return {bitness, repo, artifactName}
+}
 
 async function clone(
   url: string,
@@ -65,16 +77,15 @@ export async function getViaGit(
     verbose?: number | boolean
   ) => Promise<void>
 }> {
-  const bitness = architecture === 'i686' ? '32' : '64'
-  const owner = 'git-for-windows'
-  const repo = `git-sdk-${bitness}`
-  const artifactName = `${repo}-${flavor}`
-
+  const {bitness, repo, artifactName} = getArtifactMetadata(
+    flavor,
+    architecture
+  )
   const octokit = new Octokit()
   let head_sha: string
   if (flavor === 'minimal') {
     const info = await octokit.actions.listWorkflowRuns({
-      owner,
+      owner: REPO_OWNER,
       repo,
       workflow_id: 938271,
       status: 'success',
@@ -83,7 +94,7 @@ export async function getViaGit(
     head_sha = info.data.workflow_runs[0].head_sha
   } else {
     const info = await octokit.repos.getBranch({
-      owner,
+      owner: REPO_OWNER,
       repo,
       branch: 'main'
     })
@@ -101,7 +112,7 @@ export async function getViaGit(
     ): Promise<void> => {
       core.startGroup(`Cloning ${repo}`)
       const partialCloneArg = flavor === 'full' ? [] : ['--filter=blob:none']
-      await clone(`https://github.com/${owner}/${repo}`, `.tmp`, verbose, [
+      await clone(`https://github.com/${REPO_OWNER}/${repo}`, `.tmp`, verbose, [
         '--bare',
         ...partialCloneArg
       ])
@@ -123,7 +134,7 @@ export async function getViaGit(
       } else {
         core.startGroup('Cloning build-extra')
         await clone(
-          `https://github.com/${owner}/build-extra`,
+          `https://github.com/${REPO_OWNER}/build-extra`,
           '.tmp/build-extra',
           verbose
         )