Add production dependencies & build

* Use `fs.rmSync` instead of `fs.rmdirSync`.

To get rid of the deprecation warning. #119

* Update dependencies.

.github/workflows/checkin.yml

@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v1
 
     - name: "npm ci"
-      run: npm ci --legacy-peer-deps
+      run: npm ci
 
     - name: "npm run build"
       run: npm run build

.github/workflows/example-builds-defaultarch.yml

@@ -27,7 +27,7 @@ jobs:
 
       - name: "Install dependencies"
         run: |
-          npm install --legacy-peer-deps
+          npm install
           npm run build
           npm run pack
 

.github/workflows/example-builds-nightly-defaultarch.yml

@@ -26,7 +26,7 @@ jobs:
 
       - name: "Install dependencies"
         run: |
-          npm install --legacy-peer-deps
+          npm install
           npm run build
           npm run pack
 

.github/workflows/example-builds-nightly.yml

@@ -33,7 +33,7 @@ jobs:
 
       - name: "Install dependencies"
         run: |
-          npm install --legacy-peer-deps
+          npm install
           npm run build
           npm run pack
 

.github/workflows/example-builds.yml

@@ -32,7 +32,7 @@ jobs:
 
       - name: "Install dependencies"
         run: |
-          npm install --legacy-peer-deps
+          npm install
           npm run build
           npm run pack
 

.gitignore

@@ -1,3 +1,3 @@
 node_modules/
 __tests__/runner/*
-dist/
+!dist/

README.md

@@ -104,16 +104,43 @@ You can either specify specific Julia versions or version ranges. If you specify
 
 - `1.2.0` is a valid semver version. The action will try to download exactly this version. If it's not available, the build step will fail.
 - `1.0` is a version range that will match the highest available Julia version that starts with `1.0`, e.g. `1.0.5`, excluding pre-releases.
-- `^1.3.0-rc1` is a **caret** version range that includes pre-releases starting at `rc1`. It matches all versions `≥ 1.3.0-rc1` and `< 2.0.0`.
+- `^1.3.0-rc1` is a **caret** version range that includes pre-releases of `1.3.0` starting at `rc1`. It matches all versions `≥ 1.3.0-rc1` and `< 2.0.0`.
-- `~1.3.0-rc1` is a **tilde** version range that includes pre-releases starting at `rc1`. It matches all versions `≥ 1.3.0-rc1` and `< 1.4.0`.
+- `~1.3.0-rc1` is a **tilde** version range that includes pre-releases of `1.3.0` starting at `rc1`. It matches all versions `≥ 1.3.0-rc1` and `< 1.4.0`.
-- `^1.3.0-0` is a **caret** version range that includes _all_ pre-releases. It matches all versions `≥ 1.3.0-` and `< 2.0.0`.
+- `^1.3.0-0` is a **caret** version range that includes _all_ pre-releases of `1.3.0`. It matches all versions `≥ 1.3.0-` and `< 2.0.0`.
-- `~1.3.0-0` is a **tilde** version range that includes _all_ pre-releases. It matches all versions `≥ 1.3.0-` and `< 1.4.0`.
+- `~1.3.0-0` is a **tilde** version range that includes _all_ pre-releases of `1.3.0`. It matches all versions `≥ 1.3.0-` and `< 1.4.0`.
 - `nightly` will install the latest nightly build.
 - `1.7-nightly` will install the latest nightly build for the upcoming 1.7 release. This version will only be available during certain phases of the Julia release cycle.
 
 Internally the action uses node's semver package to resolve version ranges. Its [documentation](https://github.com/npm/node-semver#advanced-range-syntax) contains more details on the version range syntax. You can test what version will be selected for a given input in this JavaScript [REPL](https://repl.it/@SaschaMann/setup-julia-version-logic).
 
-The available Julia versions are pulled from [`versions.json`](https://julialang-s3.julialang.org/bin/versions.json). This file is automatically updated once a day. Therefore it may take up to 24 hours until a newly released Julia version is available in the action.
+#### Prereleases
+
+There are two methods of including pre-releases in version matching:
+
+1. Including the pre-release tag in the version itself, e.g. `^1.3.0-rc1`.
+2. Setting the input `include-all-prereleases` to `true`.
+
+These behave slightly differently.
+
+1. If the version `a.b.c` contains pre-release tag, all pre-releases of version `a.b.c` will be included in the version matching.
+For example, `^1.3.0-rc1` would match `1.3.0-rc2` but would **not** match `1.4.0-rc1` once released.
+2. If `include-preleases` is set to true, **all** pre-releases of all versions will be included in the version matching. In this case, `^1.3.0-rc1` would match `1.4.0-rc1` once released.
+
+**Example:** Without `include-all-prereleases: true`, the version `^1.3.0-rc1` would match `1.3.0-rc1`, `1.3.0-rc2`, `1.3.0`, `1.4.0` once they are released.
+With `include-all-prereleases: true`, it would match `1.3.0-rc1`, `1.3.0-rc2`, `1.3.0`, `1.4.0-rc1`, `1.4.0`.
+
+If you want to run tests against the latest tagged version, no matter what version that is, you can use
+
+```yaml
+- uses: julia-actions/setup-julia@v1
+  with:
+    version: '1'
+    include-all-prereleases: true
+```
+
+#### Recently released versions
+
+The available Julia versions are pulled from [`versions.json`](https://julialang-s3.julialang.org/bin/versions.json).
 
 ### Matrix Testing
 

__tests__/installer.test.ts

@@ -66,6 +66,14 @@ describe('version matching tests', () => {
         })
     })
 
+    describe('include-prereleases', () => {
+        it('Chooses the highest available version that matches the input including prereleases', () => {
+            expect(installer.getJuliaVersion(testVersions, '^1.2.0-0', true)).toEqual('1.3.0-rc4')
+            expect(installer.getJuliaVersion(testVersions, '1', true)).toEqual('1.3.0-rc4')
+            expect(installer.getJuliaVersion(testVersions, '^1.2.0-0', false)).toEqual('1.2.0')
+        })
+    })
+
     describe('node-semver behaviour', () => {
         describe('Windows installer change', () => {
             it('Correctly understands >1.4.0', () => {

action.yml

@@ -5,6 +5,10 @@ inputs:
   version:
     description: 'The Julia version to download (if necessary) and use. Example: 1.0.4'
     default: '1'
+  include-all-prereleases:
+    description: 'Include prereleases when matching the Julia version to available versions.'
+    required: false
+    default: 'false'
   arch:
     description: 'Architecture of the Julia binaries. Defaults to the architecture of the runner executing the job.'
     required: false

lib/installer.js

@@ -1,20 +1,38 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    return new (P || (P = Promise))(function (resolve, reject) {
+    if (k2 === undefined) k2 = k;
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+    var desc = Object.getOwnPropertyDescriptor(m, k);
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+      desc = { enumerable: true, get: function() { return m[k]; } };
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    }
-    });
+    Object.defineProperty(o, k2, desc);
-};
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    result["default"] = mod;
+    __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.showVersionInfo = exports.installJulia = exports.getDownloadURL = exports.getFileInfo = exports.getJuliaVersion = exports.getJuliaVersions = exports.getJuliaVersionInfo = void 0;
 const core = __importStar(require("@actions/core"));
 const exec = __importStar(require("@actions/exec"));
 const tc = __importStar(require("@actions/tool-cache"));
@@ -87,13 +105,13 @@ function getJuliaVersions(versionInfo) {
     });
 }
 exports.getJuliaVersions = getJuliaVersions;
-function getJuliaVersion(availableReleases, versionInput) {
+function getJuliaVersion(availableReleases, versionInput, includePrerelease = false) {
     if (semver.valid(versionInput) == versionInput || versionInput.endsWith('nightly')) {
         // versionInput is a valid version or a nightly version, use it directly
         return versionInput;
     }
     // Use the highest available version that matches versionInput
-    let version = semver.maxSatisfying(availableReleases, versionInput);
+    let version = semver.maxSatisfying(availableReleases, versionInput, { includePrerelease });
     if (version == null) {
         throw new Error(`Could not find a Julia version that matches ${versionInput}`);
     }

lib/setup-julia.js

@@ -1,19 +1,36 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    return new (P || (P = Promise))(function (resolve, reject) {
+    if (k2 === undefined) k2 = k;
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+    var desc = Object.getOwnPropertyDescriptor(m, k);
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+      desc = { enumerable: true, get: function() { return m[k]; } };
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    }
-    });
+    Object.defineProperty(o, k2, desc);
-};
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    result["default"] = mod;
+    __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core = __importStar(require("@actions/core"));
 const tc = __importStar(require("@actions/tool-cache"));
@@ -27,7 +44,8 @@ const archSynonyms = {
     'x64': 'x64',
     'X64': 'x64',
     'aarch64': 'aarch64',
-    'ARM64': 'aarch64'
+    'ARM64': 'aarch64',
+    'arm64': 'aarch64'
 };
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
@@ -49,6 +67,7 @@ function run() {
             }
             // Inputs
             const versionInput = core.getInput('version');
+            const includePrereleases = core.getInput('include-all-prereleases') == 'true';
             const originalArchInput = core.getInput('arch');
             // It can easily happen that, for example, a workflow file contains an input `version: ${{ matrix.julia-version }}`
             // while the strategy matrix only contains a key `${{ matrix.version }}`.
@@ -64,7 +83,7 @@ function run() {
             const arch = archSynonyms[originalArchInput];
             const versionInfo = yield installer.getJuliaVersionInfo();
             const availableReleases = yield installer.getJuliaVersions(versionInfo);
-            const version = installer.getJuliaVersion(availableReleases, versionInput);
+            const version = installer.getJuliaVersion(availableReleases, versionInput, includePrereleases);
             core.debug(`selected Julia version: ${arch}/${version}`);
             core.setOutput('julia-version', version);
             // Search in cache
@@ -77,7 +96,7 @@ function run() {
                 juliaPath = yield tc.cacheDir(juliaInstallationPath, 'julia', version, arch);
                 core.debug(`added Julia to cache: ${juliaPath}`);
                 // Remove temporary dir
-                fs.rmdirSync(juliaInstallationPath, { recursive: true });
+                fs.rmSync(juliaInstallationPath, { recursive: true });
             }
             else {
                 core.debug(`using cached version of Julia: ${juliaPath}`);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-julia",
-  "version": "1.8.2",
+  "version": "1.9.2",
   "private": true,
   "description": "setup Julia action",
   "main": "lib/setup-julia.js",
@@ -21,24 +21,25 @@
   "author": "Sascha Mann <git@mail.saschamann.eu>",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.2.6",
+    "@actions/core": "^1.10.0",
-    "@actions/exec": "^1.0.0",
+    "@actions/exec": "^1.1.1",
-    "@actions/io": "^1.0.0",
+    "@actions/io": "^1.1.2",
-    "@actions/tool-cache": "^1.0.0",
+    "@actions/tool-cache": "^2.0.1",
-    "async-retry": "^1.3.1",
+    "async-retry": "^1.3.3",
-    "semver": "^6.3.0"
+    "semver": "^7.3.8"
   },
   "devDependencies": {
-    "@types/async-retry": "^1.4.2",
+    "@types/async-retry": "^1.4.5",
-    "@types/jest": "^24.0.13",
+    "@types/jest": "^29.4.0",
-    "@types/node": "^12.12.7",
+    "@types/node": "^16.18.12",
-    "@types/semver": "^6.0.0",
+    "@types/retry": "^0.12.2",
-    "@zeit/ncc": "^0.22.0",
+    "@types/semver": "^7.3.13",
-    "jest": "^24.8.0",
+    "@zeit/ncc": "^0.22.3",
-    "jest-circus": "^24.7.1",
+    "jest": "^29.4.2",
-    "nock": "^11.7.2",
+    "jest-circus": "^29.4.2",
-    "prettier": "^1.17.1",
+    "nock": "^13.3.0",
-    "ts-jest": "^26.0.0",
+    "prettier": "^2.8.4",
-    "typescript": "^3.5.1"
+    "ts-jest": "^29.0.5",
+    "typescript": "^4.9.5"
   }
 }

src/installer.ts

@@ -75,14 +75,14 @@ export async function getJuliaVersions(versionInfo): Promise<string[]> {
     return versions
 }
 
-export function getJuliaVersion(availableReleases: string[], versionInput: string): string {
+export function getJuliaVersion(availableReleases: string[], versionInput: string, includePrerelease: boolean = false): string {
     if (semver.valid(versionInput) == versionInput || versionInput.endsWith('nightly')) {
         // versionInput is a valid version or a nightly version, use it directly
         return versionInput
     }
 
     // Use the highest available version that matches versionInput
-    let version = semver.maxSatisfying(availableReleases, versionInput)
+    let version = semver.maxSatisfying(availableReleases, versionInput, {includePrerelease})
     if (version == null) {
         throw new Error(`Could not find a Julia version that matches ${versionInput}`)
     }

src/setup-julia.ts

@@ -14,7 +14,8 @@ const archSynonyms = {
     'x64': 'x64',
     'X64': 'x64',
     'aarch64': 'aarch64',
-    'ARM64': 'aarch64'
+    'ARM64': 'aarch64',
+    'arm64': 'aarch64'
 }
 
 async function run() {
@@ -39,6 +40,7 @@ async function run() {
 
         // Inputs
         const versionInput = core.getInput('version')
+        const includePrereleases = core.getInput('include-all-prereleases') == 'true'
         const originalArchInput = core.getInput('arch')
 
         // It can easily happen that, for example, a workflow file contains an input `version: ${{ matrix.julia-version }}`
@@ -57,7 +59,7 @@ async function run() {
 
         const versionInfo = await installer.getJuliaVersionInfo()
         const availableReleases = await installer.getJuliaVersions(versionInfo)
-        const version = installer.getJuliaVersion(availableReleases, versionInput)
+        const version = installer.getJuliaVersion(availableReleases, versionInput, includePrereleases)
         core.debug(`selected Julia version: ${arch}/${version}`)
         core.setOutput('julia-version', version)
 
@@ -74,7 +76,7 @@ async function run() {
             core.debug(`added Julia to cache: ${juliaPath}`)
 
             // Remove temporary dir
-            fs.rmdirSync(juliaInstallationPath, {recursive: true})
+            fs.rmSync(juliaInstallationPath, {recursive: true})
         } else {
             core.debug(`using cached version of Julia: ${juliaPath}`)
         }
@@ -89,7 +91,7 @@ async function run() {
         const showVersionInfoInput = core.getInput('show-versioninfo')
         await installer.showVersionInfo(showVersionInfoInput, version)
     } catch (error) {
-        core.setFailed(error.message)
+        core.setFailed((error as Error).message)
     }
 }