Skip to content

Commit 1fb0617

Browse files
authored
Merge pull request #124 from borkdude/issue-115
Fix #115: use clj-msi latest version for Windows
2 parents ada62bb + 6419298 commit 1fb0617

File tree

6 files changed

+13
-7
lines changed

6 files changed

+13
-7
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
java-version: '8'
4747

4848
- name: Install clojure tools
49-
uses: DeLaGuardo/setup-clojure@13.2
49+
uses: DeLaGuardo/setup-clojure@13.3
5050
with:
5151
# Install just one or all simultaneously
5252
# The value must indicate a particular version of the tool, or use 'latest'

dist/index.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,10 @@ function toolVersion(version, githubAuth) {
350350
var _a;
351351
core.debug('=== Check tool version');
352352
if (version === 'latest') {
353-
const res = yield client.getJson('https://api.github.com/repos/clojure/brew-install/releases/latest', githubAuth ? { Authorization: githubAuth } : {});
353+
const url = utils.isWindows()
354+
? 'https://api.github.com/repos/casselc/clj-msi/releases/latest'
355+
: 'https://api.github.com/repos/clojure/brew-install/releases/latest';
356+
const res = yield client.getJson(url, githubAuth ? { Authorization: githubAuth } : {});
354357
const versionString = (_a = res.result) === null || _a === void 0 ? void 0 : _a.tag_name;
355358
if (versionString) {
356359
return versionString;
@@ -1306,7 +1309,7 @@ function isMacOS() {
13061309

13071310
Object.defineProperty(exports, "__esModule", ({ value: true }));
13081311
exports.VERSION = void 0;
1309-
exports.VERSION = '13-2';
1312+
exports.VERSION = '13-3';
13101313

13111314

13121315
/***/ }),

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "setup-clojure",
3-
"version": "13.2",
3+
"version": "13.3",
44
"private": true,
55
"description": "setup clojure action",
66
"main": "lib/setup-clojure.js",

src/cli.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@ async function toolVersion(
2222
): Promise<string> {
2323
core.debug('=== Check tool version')
2424
if (version === 'latest') {
25+
const url = utils.isWindows()
26+
? 'https://api.github.com/repos/casselc/clj-msi/releases/latest'
27+
: 'https://api.github.com/repos/clojure/brew-install/releases/latest'
2528
const res = await client.getJson<{tag_name: string}>(
26-
'https://api.github.com/repos/clojure/brew-install/releases/latest',
29+
url,
2730
githubAuth ? {Authorization: githubAuth} : {}
2831
)
2932
const versionString = res.result?.tag_name

src/version.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const VERSION = '13-2'
1+
export const VERSION = '13-3'

0 commit comments

Comments
 (0)