Use Mac ARM launchers from main repo for coursier >= 2.1.16

coursier · Nov 11, 2024 · fb8e01e · fb8e01e
1 parent f4e9717
commit fb8e01e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,7 +27,8 @@
   "dependencies": {
     "@actions/core": "^1.11.1",
     "@actions/exec": "^1.1.1",
-    "@actions/tool-cache": "^2.0.1"
+    "@actions/tool-cache": "^2.0.1",
+    "compare-versions": "^6.1.1"
   },
   "devDependencies": {
     "@stylistic/eslint-plugin": "^2.10.1",

diff --git a/src/main.ts b/src/main.ts
@@ -4,6 +4,10 @@ import * as os from 'os'
 import * as path from 'path'
 import * as tc from '@actions/tool-cache'
 
+// would have preferred to use coursier.core.Version here,
+// but coursier is not published on npm
+import { compareVersions } from 'compare-versions'
+
 const defaultVersion_x86_64 = '2.1.14'
 const defaultVersion_aarch64 = '2.1.14'
 
@@ -16,7 +20,7 @@ const csVersion =
   (architecture === architecture_x86_64 ? defaultVersion_x86_64 : defaultVersion_aarch64)
 const coursierVersionSpec = csVersion
 const coursierBinariesGithubRepository =
-  architecture === architecture_x86_64
+  architecture === architecture_x86_64 || compareVersions(csVersion, '2.1.16') >= 0
     ? 'https://github.com/coursier/coursier/'
     : 'https://github.com/VirtusLab/coursier-m1/'