Add production dependencies & build

.github/workflows/example-builds.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        julia-version: ['1.0.5', '1.2', '^1.5.0-beta1', '1']
+        julia-version: ['1.0.5', '1', '^1.5.0-beta1']
         julia-arch: [x64, x86]
         os: [ubuntu-latest, macOS-latest, windows-latest]
         # 32-bit Julia binaries are not available on macOS

README.md

@@ -104,42 +104,15 @@ 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 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 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 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 of `1.3.0`. It matches all versions `≥ 1.3.0-` and `< 1.4.0`.
+- `^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 **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-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 **tilde** version range that includes _all_ pre-releases. 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).
 
-#### 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). 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.
 
 ### Matrix Testing

__tests__/installer.test.ts

@@ -66,14 +66,6 @@ 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,10 +5,6 @@ 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

@@ -87,13 +87,13 @@ function getJuliaVersions(versionInfo) {
     });
 }
 exports.getJuliaVersions = getJuliaVersions;
-function getJuliaVersion(availableReleases, versionInput, includePrerelease = false) {
+function getJuliaVersion(availableReleases, versionInput) {
     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, { includePrerelease });
+    let version = semver.maxSatisfying(availableReleases, versionInput);
     if (version == null) {
         throw new Error(`Could not find a Julia version that matches ${versionInput}`);
     }
@@ -102,57 +102,30 @@ function getJuliaVersion(availableReleases, versionInput, includePrerelease = fa
     return version;
 }
 exports.getJuliaVersion = getJuliaVersion;
-function getDesiredFileExts() {
-    let fileExt1;
-    let hasFileExt2;
-    let fileExt2;
-    if (osPlat == 'win32') {
-        fileExt1 = 'exe';
-        hasFileExt2 = false;
-        fileExt2 = '';
-    }
-    else if (osPlat == 'darwin') {
-        fileExt1 = 'tar.gz';
-        hasFileExt2 = true;
-        fileExt2 = 'dmg';
-    }
-    else if (osPlat === 'linux') {
-        fileExt1 = 'tar.gz';
-        hasFileExt2 = false;
-        fileExt2 = '';
-    }
-    else {
-        throw new Error(`Platform ${osPlat} is not supported`);
-    }
-    return [fileExt1, hasFileExt2, fileExt2];
-}
 function getNightlyFileName(arch) {
-    let versionExt;
-    let fileExt1;
-    [fileExt1, ,] = getDesiredFileExts();
+    let versionExt, ext;
     if (osPlat == 'win32') {
         versionExt = arch == 'x64' ? '-win64' : '-win32';
+        ext = 'exe';
     }
     else if (osPlat == 'darwin') {
         if (arch == 'x86') {
             throw new Error('32-bit Julia is not available on macOS');
         }
         versionExt = '-mac64';
+        ext = 'dmg';
     }
     else if (osPlat === 'linux') {
         versionExt = arch == 'x64' ? '-linux64' : '-linux32';
+        ext = 'tar.gz';
     }
     else {
         throw new Error(`Platform ${osPlat} is not supported`);
     }
-    return `julia-latest${versionExt}.${fileExt1}`;
+    return `julia-latest${versionExt}.${ext}`;
 }
 function getFileInfo(versionInfo, version, arch) {
     const err = `Could not find ${archMap[arch]}/${version} binaries`;
-    let fileExt1;
-    let hasFileExt2;
-    let fileExt2;
-    [fileExt1, hasFileExt2, fileExt2] = getDesiredFileExts();
     if (version.endsWith('nightly')) {
         return null;
     }
@@ -161,19 +134,7 @@ function getFileInfo(versionInfo, version, arch) {
     }
     for (let file of versionInfo[version].files) {
         if (file.os == osMap[osPlat] && file.arch == archMap[arch]) {
-            if (file.extension == fileExt1) {
-                return file;
-            }
-        }
-    }
-    if (hasFileExt2) {
-        core.debug(`Could not find ${fileExt1}; trying to find ${fileExt2} instead`);
-        for (let file of versionInfo[version].files) {
-            if (file.os == osMap[osPlat] && file.arch == archMap[arch]) {
-                if (file.extension == fileExt2) {
-                    return file;
-                }
-            }
+            return file;
         }
     }
     throw err;
@@ -240,17 +201,9 @@ function installJulia(versionInfo, version, arch) {
                 }
                 return tempInstallDir;
             case 'darwin':
-                if (fileInfo !== null && fileInfo.extension == 'dmg') {
-                    core.debug(`Support for .dmg files is deprecated and may be removed in a future release`);
-                    yield exec.exec('hdiutil', ['attach', juliaDownloadPath]);
-                    yield exec.exec('/bin/bash', ['-c', `cp -a /Volumes/Julia-*/Julia-*.app/Contents/Resources/julia ${tempInstallDir}`]);
-                    return path.join(tempInstallDir, 'julia');
-                }
-                else {
-                    // tc.extractTar doesn't support stripping components, so we have to call tar manually
-                    yield exec.exec('tar', ['xf', juliaDownloadPath, '--strip-components=1', '-C', tempInstallDir]);
-                    return tempInstallDir;
-                }
+                yield exec.exec('hdiutil', ['attach', juliaDownloadPath]);
+                yield exec.exec('/bin/bash', ['-c', `cp -a /Volumes/Julia-*/Julia-*.app/Contents/Resources/julia ${tempInstallDir}`]);
+                return path.join(tempInstallDir, 'julia');
             default:
                 throw new Error(`Platform ${osPlat} is not supported`);
         }

lib/setup-julia.js

@@ -49,7 +49,6 @@ 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 }}`.
@@ -65,7 +64,7 @@ function run() {
             const arch = archSynonyms[originalArchInput];
             const versionInfo = yield installer.getJuliaVersionInfo();
             const availableReleases = yield installer.getJuliaVersions(versionInfo);
-            const version = installer.getJuliaVersion(availableReleases, versionInput, includePrereleases);
+            const version = installer.getJuliaVersion(availableReleases, versionInput);
             core.debug(`selected Julia version: ${arch}/${version}`);
             core.setOutput('julia-version', version);
             // Search in cache

package-lock.json

@@ -1,15 +1,15 @@
 {
   "name": "setup-julia",
-  "version": "1.9.0",
+  "version": "1.8.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "setup-julia",
-      "version": "1.9.0",
+      "version": "1.8.1",
       "license": "MIT",
       "dependencies": {
-        "@actions/core": "^1.10.0",
+        "@actions/core": "^1.2.6",
         "@actions/exec": "^1.0.0",
         "@actions/io": "^1.0.0",
         "@actions/tool-cache": "^1.0.0",
@@ -31,43 +31,15 @@
       }
     },
     "node_modules/@actions/core": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
-      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
-      "dependencies": {
-        "@actions/http-client": "^2.0.1",
-        "uuid": "^8.3.2"
-      }
-    },
-    "node_modules/@actions/core/node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.6.tgz",
+      "integrity": "sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA=="
     },
     "node_modules/@actions/exec": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.0.0.tgz",
       "integrity": "sha512-nquH0+XKng+Ll7rZfCojN7NWSbnGh+ltwUJhzfbLkmOJgxocGX2/yXcZLMyT9fa7+tByEow/NSTrBExNlEj9fw=="
     },
-    "node_modules/@actions/http-client": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
-      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
-      "dependencies": {
-        "tunnel": "^0.0.6"
-      }
-    },
-    "node_modules/@actions/http-client/node_modules/tunnel": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
-      "engines": {
-        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
-      }
-    },
     "node_modules/@actions/io": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.0.0.tgz",
@@ -8522,41 +8494,15 @@
   },
   "dependencies": {
     "@actions/core": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
-      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
-      "requires": {
-        "@actions/http-client": "^2.0.1",
-        "uuid": "^8.3.2"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "8.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-        }
-      }
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.6.tgz",
+      "integrity": "sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA=="
     },
     "@actions/exec": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.0.0.tgz",
       "integrity": "sha512-nquH0+XKng+Ll7rZfCojN7NWSbnGh+ltwUJhzfbLkmOJgxocGX2/yXcZLMyT9fa7+tByEow/NSTrBExNlEj9fw=="
     },
-    "@actions/http-client": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
-      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
-      "requires": {
-        "tunnel": "^0.0.6"
-      },
-      "dependencies": {
-        "tunnel": {
-          "version": "0.0.6",
-          "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-          "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
-        }
-      }
-    },
     "@actions/io": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.0.0.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-julia",
-  "version": "1.9.0",
+  "version": "1.8.1",
   "private": true,
   "description": "setup Julia action",
   "main": "lib/setup-julia.js",
@@ -21,7 +21,7 @@
   "author": "Sascha Mann <git@mail.saschamann.eu>",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.10.0",
+    "@actions/core": "^1.2.6",
     "@actions/exec": "^1.0.0",
     "@actions/io": "^1.0.0",
     "@actions/tool-cache": "^1.0.0",

src/installer.ts

@@ -75,14 +75,14 @@ export async function getJuliaVersions(versionInfo): Promise<string[]> {
     return versions
 }
 
-export function getJuliaVersion(availableReleases: string[], versionInput: string, includePrerelease: boolean = false): string {
+export function getJuliaVersion(availableReleases: string[], versionInput: string): 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, {includePrerelease})
+    let version = semver.maxSatisfying(availableReleases, versionInput)
     if (version == null) {
         throw new Error(`Could not find a Julia version that matches ${versionInput}`)
     }
@@ -93,59 +93,31 @@ export function getJuliaVersion(availableReleases: string[], versionInput: strin
     return version
 }
 
-function getDesiredFileExts(): [string, boolean, string] {
-    let fileExt1: string
-    let hasFileExt2: boolean
-    let fileExt2: string
-
-    if (osPlat == 'win32') {
-        fileExt1 = 'exe'
-        hasFileExt2 = false
-        fileExt2 = ''
-    } else if (osPlat == 'darwin') {
-        fileExt1 = 'tar.gz'
-        hasFileExt2 = true
-        fileExt2 = 'dmg'
-    } else if (osPlat === 'linux') {
-        fileExt1 = 'tar.gz'
-        hasFileExt2 = false
-        fileExt2 = ''
-    } else {
-        throw new Error(`Platform ${osPlat} is not supported`)
-    }
-
-    return [fileExt1, hasFileExt2, fileExt2]
-}
-
 function getNightlyFileName(arch: string): string {
-    let versionExt: string
-    let fileExt1: string
-    [fileExt1, , ] = getDesiredFileExts()
+    let versionExt: string, ext: string
 
     if (osPlat == 'win32') {
         versionExt = arch == 'x64' ? '-win64' : '-win32'
+        ext = 'exe'
     } else if (osPlat == 'darwin') {
         if (arch == 'x86') {
             throw new Error('32-bit Julia is not available on macOS')
         }
         versionExt = '-mac64'
+        ext = 'dmg'
     } else if (osPlat === 'linux') {
         versionExt = arch == 'x64' ? '-linux64' : '-linux32'
+        ext = 'tar.gz'
     } else {
         throw new Error(`Platform ${osPlat} is not supported`)
     }
 
-    return `julia-latest${versionExt}.${fileExt1}`
+    return `julia-latest${versionExt}.${ext}`
 }
 
 export function getFileInfo(versionInfo, version: string, arch: string) {
     const err = `Could not find ${archMap[arch]}/${version} binaries`
 
-    let fileExt1: string
-    let hasFileExt2: boolean
-    let fileExt2: string
-    [fileExt1, hasFileExt2, fileExt2] = getDesiredFileExts()
-
     if (version.endsWith('nightly')) {
         return null
     }
@@ -156,20 +128,7 @@ export function getFileInfo(versionInfo, version: string, arch: string) {
 
     for (let file of versionInfo[version].files) {
         if (file.os == osMap[osPlat] && file.arch == archMap[arch]) {
-            if (file.extension == fileExt1) {
-                return file
-            }
-        }
-    }
-
-    if (hasFileExt2) {
-        core.debug(`Could not find ${fileExt1}; trying to find ${fileExt2} instead`)
-        for (let file of versionInfo[version].files) {
-            if (file.os == osMap[osPlat] && file.arch == archMap[arch]) {
-                if (file.extension == fileExt2) {
-                    return file
-                }
-            }
+            return file
         }
     }
 
@@ -213,6 +172,7 @@ export async function installJulia(versionInfo, version: string, arch: string):
         }
     })
 
+
     // Verify checksum
     if (!version.endsWith('nightly')) {
         const checkSum = await calculateChecksum(juliaDownloadPath)
@@ -241,16 +201,9 @@ export async function installJulia(versionInfo, version: string, arch: string):
             }
             return tempInstallDir
         case 'darwin':
-            if (fileInfo !== null && fileInfo.extension == 'dmg') {
-                core.debug(`Support for .dmg files is deprecated and may be removed in a future release`)
-                await exec.exec('hdiutil', ['attach', juliaDownloadPath])
-                await exec.exec('/bin/bash', ['-c', `cp -a /Volumes/Julia-*/Julia-*.app/Contents/Resources/julia ${tempInstallDir}`])
-                return path.join(tempInstallDir, 'julia')
-            } else {
-                // tc.extractTar doesn't support stripping components, so we have to call tar manually
-                await exec.exec('tar', ['xf', juliaDownloadPath, '--strip-components=1', '-C', tempInstallDir])
-                return tempInstallDir
-            }
+            await exec.exec('hdiutil', ['attach', juliaDownloadPath])
+            await exec.exec('/bin/bash', ['-c', `cp -a /Volumes/Julia-*/Julia-*.app/Contents/Resources/julia ${tempInstallDir}`])
+            return path.join(tempInstallDir, 'julia')
         default:
             throw new Error(`Platform ${osPlat} is not supported`)
     }

src/setup-julia.ts

@@ -39,7 +39,6 @@ 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 }}`
@@ -58,7 +57,7 @@ async function run() {
 
         const versionInfo = await installer.getJuliaVersionInfo()
         const availableReleases = await installer.getJuliaVersions(versionInfo)
-        const version = installer.getJuliaVersion(availableReleases, versionInput, includePrereleases)
+        const version = installer.getJuliaVersion(availableReleases, versionInput)
         core.debug(`selected Julia version: ${arch}/${version}`)
         core.setOutput('julia-version', version)