Skip to content

Commit

Permalink
Merge pull request #705 from alexarchambault/coursier-2.1.17
Browse files Browse the repository at this point in the history
Update default coursier version to 2.1.17
  • Loading branch information
alexarchambault authored Nov 11, 2024
2 parents f4e9717 + 1f0cf93 commit e52a786
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
9 changes: 8 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 7 additions & 3 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ import * as os from 'os'
import * as path from 'path'
import * as tc from '@actions/tool-cache'

const defaultVersion_x86_64 = '2.1.14'
const defaultVersion_aarch64 = '2.1.14'
// 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.17'
const defaultVersion_aarch64 = '2.1.17'

const architecture_x86_64 = 'x86_64'
const architecture_aarch64 = 'aarch64'
Expand All @@ -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/'

Expand Down

0 comments on commit e52a786

Please sign in to comment.