Add support for aarch64

.github/workflows/test.yml

@@ -12,6 +12,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
         jvm: ['8', '11']
+        architecture: ['x86_64', 'aarch6']
     steps:
     - uses: actions/checkout@v3
 
@@ -29,6 +30,7 @@ jobs:
       with:
         jvm: ${{ matrix.jvm }}
         apps: sbt sbtn ammonite bloop:1.4.11
+        architecture: ${{ matrix.architecture }}
 
     # - uses: coursier/cache-action@v5
     - run: echo cs-version=${{ steps.cs-setup.outputs.cs-version }}

README.md

@@ -20,6 +20,8 @@ Inspired by [olafurpg/setup-scala](https://github.com/olafurpg/setup-scala) and
   - if left empty either the existing JVM will be used or Coursier will install its default JVM.
 - `apps` (optional): Scala apps to install (`sbtn` by default)
   - space separated list of app names (from the [main channel](https://github.com/coursier/apps))
+- `architecture` (optional): Coursier architecture to install binaries for
+  - valid values: `x86_64`, `aarch6` (defaults to `x86_64`)
 
 ### Example with custom inputs
 
@@ -30,6 +32,7 @@ Inspired by [olafurpg/setup-scala](https://github.com/olafurpg/setup-scala) and
       with:
         jvm: adopt:11
         apps: sbtn bloop ammonite
+        architecture: aarch64
 ```
 
 ## Outputs

action.yml

@@ -17,6 +17,10 @@ inputs:
     description: 'Coursier version to install'
     required: false
     default: ''
+  architecture:
+    description: 'Coursier architecture to install'
+    required: false
+    default: ''
 outputs:
   cs-version:
     description: 'Version of the installed Coursier'

src/main.ts

@@ -4,11 +4,17 @@ import * as os from 'os'
 import * as path from 'path'
 import * as tc from '@actions/tool-cache'
 
-let csVersion = core.getInput('version')
-if (!csVersion) csVersion = '2.1.0-M7-39-gb8f3d7532'
+const validArchitectures = Object.freeze(['x86_64', 'aarch6'])
+
+const csVersion = core.getInput('version') || '2.1.0-M7-39-gb8f3d7532'
+const architecture = core.getInput('architecture') || validArchitectures[0]
 
 const coursierVersionSpec = csVersion
 
+function isValidArchitecture(arch: string): Boolean {
+  return validArchitectures.includes(arch)
+}
+
 async function execOutput(cmd: string, ...args: string[]): Promise<string> {
   let output = ''
   const options = {
@@ -23,28 +29,28 @@ async function execOutput(cmd: string, ...args: string[]): Promise<string> {
 }
 
 async function downloadCoursier(): Promise<string> {
-  const baseUrl = `https://github.com/coursier/coursier/releases/download/v${csVersion}/cs-x86_64`
+  const baseUrl = `https://github.com/coursier/coursier/releases/download/v${csVersion}/cs-${architecture}`
   let csBinary = ''
   switch (process.platform) {
     case 'linux': {
       const guid = await tc.downloadTool(`${baseUrl}-pc-linux.gz`)
-      const arc = `${guid}.gz`
-      await cli.exec('mv', [guid, arc])
-      csBinary = arc
+      const archive = `${guid}.gz`
+      await cli.exec('mv', [guid, archive])
+      csBinary = archive
       break
     }
     case 'darwin': {
       const guid = await tc.downloadTool(`${baseUrl}-apple-darwin.gz`)
-      const arc = `${guid}.gz`
-      await cli.exec('mv', [guid, arc])
-      csBinary = arc
+      const archive = `${guid}.gz`
+      await cli.exec('mv', [guid, archive])
+      csBinary = archive
       break
     }
     case 'win32': {
       const guid = await tc.downloadTool(`${baseUrl}-pc-win32.zip`)
-      const arc = `${guid}.zip`
-      await cli.exec('mv', [guid, arc])
-      csBinary = arc
+      const archive = `${guid}.zip`
+      await cli.exec('mv', [guid, archive])
+      csBinary = archive
       break
     }
     default:
@@ -57,8 +63,8 @@ async function downloadCoursier(): Promise<string> {
   }
   if (csBinary.endsWith('.zip')) {
     const destDir = csBinary.slice(0, csBinary.length - '.zip'.length)
-    await cli.exec('unzip', ['-j', csBinary, 'cs-x86_64-pc-win32.exe', '-d', destDir])
-    csBinary = `${destDir}\\cs-x86_64-pc-win32.exe`
+    await cli.exec('unzip', ['-j', csBinary, `cs-${architecture}-pc-win32.exe`, '-d', destDir])
+    csBinary = `${destDir}\\cs-${architecture}-pc-win32.exe`
   }
   await cli.exec('chmod', ['+x', csBinary])
   return csBinary
@@ -79,6 +85,13 @@ async function cs(...args: string[]): Promise<string> {
 
 async function run(): Promise<void> {
   try {
+    if (!isValidArchitecture(architecture)) {
+      core.setFailed(
+        `Invalid architecture specified. Valid options are: ${validArchitectures.join(', ')}`,
+      )
+      return
+    }
+
     await core.group('Install Coursier', async () => {
       await cs('--help')
       core.setOutput('cs-version', csVersion)