Add production dependencies & build

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

@@ -2,7 +2,6 @@ name: Example builds (nightly)
 
 on:
   push:
-    branches: ['main', 'master', 'releases/*']
   pull_request:
   schedule:
     - cron: '37 17 * * *'
@@ -13,7 +12,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        julia-version: [nightly, 1.6-nightly]
         julia-arch: [x64, x86]
         os: [ubuntu-latest, macOS-latest, windows-latest]
         # 32-bit Julia binaries are not available on macOS
@@ -30,10 +28,10 @@ jobs:
           npm run build
           npm run pack
 
-      - name: "Set up Julia (${{ matrix.julia-version }})"
+      - name: "Set up Julia (nightly)"
         uses: ./
         with:
-          version: ${{ matrix.julia-version }}
+          version: nightly
           arch: ${{ matrix.julia-arch }}
           show-versioninfo: 'true'
       - run: julia --version

.github/workflows/example-builds.yml

@@ -1,9 +1,6 @@
 name: Example builds
 
-on:
-  push:
-    branches: ['main', 'master', 'releases/*']
-  pull_request:
+on: [push, pull_request]
 
 jobs:
   test:

README.md

@@ -93,7 +93,6 @@ You can either specify specific Julia versions or version ranges. If you specify
 - `^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.6-nightly` will install the latest nightly build for the upcoming 1.6 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).
 

dist/index.js

@@ -4141,10 +4141,14 @@ function getJuliaVersions(versionInfo) {
 }
 exports.getJuliaVersions = getJuliaVersions;
 function getJuliaVersion(availableReleases, versionInput) {
-    if (semver.valid(versionInput) == versionInput || versionInput.endsWith('nightly')) {
-        // versionInput is a valid version or a nightly version, use it directly
+    if (semver.valid(versionInput) == versionInput) {
+        // versionInput is a valid version, use it directly
         return versionInput;
     }
+    // nightlies
+    if (versionInput == 'nightly') {
+        return 'nightly';
+    }
     // Use the highest available version that matches versionInput
     let version = semver.maxSatisfying(availableReleases, versionInput);
     if (version == null) {
@@ -4178,7 +4182,7 @@ function getNightlyFileName(arch) {
     return `julia-latest${versionExt}.${ext}`;
 }
 function getFileInfo(versionInfo, version, arch) {
-    if (version.endsWith('nightly')) {
+    if (version == 'nightly') {
         return null;
     }
     for (let file of versionInfo[version].files) {
@@ -4190,15 +4194,10 @@ function getFileInfo(versionInfo, version, arch) {
 }
 exports.getFileInfo = getFileInfo;
 function getDownloadURL(fileInfo, version, arch) {
-    const baseURL = `https://julialangnightlies-s3.julialang.org/bin/${osMap[osPlat]}/${arch}`;
-    // release branch nightlies, e.g. 1.6-nightlies should return .../bin/linux/x64/1.6/julia-latest-linux64.tar.gz
-    const majorMinorMatches = /^(\d*.\d*)-nightly/.exec(version);
-    if (majorMinorMatches) {
-        return `${baseURL}/${majorMinorMatches[1]}/${getNightlyFileName(arch)}`;
-    }
     // nightlies
     if (version == 'nightly') {
-        return `${baseURL}/${getNightlyFileName(arch)}`;
+        const baseURL = 'https://julialangnightlies-s3.julialang.org/bin';
+        return `${baseURL}/${osMap[osPlat]}/${arch}/${getNightlyFileName(arch)}`;
     }
     return fileInfo.url;
 }
@@ -4211,7 +4210,7 @@ function installJulia(versionInfo, version, arch) {
         core.debug(`downloading Julia from ${downloadURL}`);
         const juliaDownloadPath = yield tc.downloadTool(downloadURL);
         // Verify checksum
-        if (!version.endsWith('nightly')) {
+        if (version != 'nightly') {
             const checkSum = yield calculateChecksum(juliaDownloadPath);
             if (fileInfo.sha256 != checkSum) {
                 throw new Error(`Checksum of downloaded file does not match the expected checksum from versions.json.\nExpected: ${fileInfo.sha256}\nGot: ${checkSum}`);
@@ -4229,7 +4228,7 @@ function installJulia(versionInfo, version, arch) {
                 yield exec.exec('tar', ['xf', juliaDownloadPath, '--strip-components=1', '-C', tempInstallDir]);
                 return tempInstallDir;
             case 'win32':
-                if (version.endsWith('nightly') || semver.gtr(version, '1.3', { includePrerelease: true })) {
+                if (version == 'nightly' || semver.gtr(version, '1.3', { includePrerelease: true })) {
                     // The installer changed in 1.4: https://github.com/JuliaLang/julia/blob/ef0c9108b12f3ae177c51037934351ffa703b0b5/NEWS.md#build-system-changes
                     yield exec.exec('powershell', ['-Command', `Start-Process -FilePath ${juliaDownloadPath} -ArgumentList "/SILENT /dir=${path.join(process.cwd(), tempInstallDir)}" -NoNewWindow -Wait`]);
                 }

lib/installer.js

@@ -78,10 +78,14 @@ function getJuliaVersions(versionInfo) {
 }
 exports.getJuliaVersions = getJuliaVersions;
 function getJuliaVersion(availableReleases, versionInput) {
-    if (semver.valid(versionInput) == versionInput || versionInput.endsWith('nightly')) {
-        // versionInput is a valid version or a nightly version, use it directly
+    if (semver.valid(versionInput) == versionInput) {
+        // versionInput is a valid version, use it directly
         return versionInput;
     }
+    // nightlies
+    if (versionInput == 'nightly') {
+        return 'nightly';
+    }
     // Use the highest available version that matches versionInput
     let version = semver.maxSatisfying(availableReleases, versionInput);
     if (version == null) {
@@ -115,7 +119,7 @@ function getNightlyFileName(arch) {
     return `julia-latest${versionExt}.${ext}`;
 }
 function getFileInfo(versionInfo, version, arch) {
-    if (version.endsWith('nightly')) {
+    if (version == 'nightly') {
         return null;
     }
     for (let file of versionInfo[version].files) {
@@ -127,15 +131,10 @@ function getFileInfo(versionInfo, version, arch) {
 }
 exports.getFileInfo = getFileInfo;
 function getDownloadURL(fileInfo, version, arch) {
-    const baseURL = `https://julialangnightlies-s3.julialang.org/bin/${osMap[osPlat]}/${arch}`;
-    // release branch nightlies, e.g. 1.6-nightlies should return .../bin/linux/x64/1.6/julia-latest-linux64.tar.gz
-    const majorMinorMatches = /^(\d*.\d*)-nightly/.exec(version);
-    if (majorMinorMatches) {
-        return `${baseURL}/${majorMinorMatches[1]}/${getNightlyFileName(arch)}`;
-    }
     // nightlies
     if (version == 'nightly') {
-        return `${baseURL}/${getNightlyFileName(arch)}`;
+        const baseURL = 'https://julialangnightlies-s3.julialang.org/bin';
+        return `${baseURL}/${osMap[osPlat]}/${arch}/${getNightlyFileName(arch)}`;
     }
     return fileInfo.url;
 }
@@ -148,7 +147,7 @@ function installJulia(versionInfo, version, arch) {
         core.debug(`downloading Julia from ${downloadURL}`);
         const juliaDownloadPath = yield tc.downloadTool(downloadURL);
         // Verify checksum
-        if (!version.endsWith('nightly')) {
+        if (version != 'nightly') {
             const checkSum = yield calculateChecksum(juliaDownloadPath);
             if (fileInfo.sha256 != checkSum) {
                 throw new Error(`Checksum of downloaded file does not match the expected checksum from versions.json.\nExpected: ${fileInfo.sha256}\nGot: ${checkSum}`);
@@ -166,7 +165,7 @@ function installJulia(versionInfo, version, arch) {
                 yield exec.exec('tar', ['xf', juliaDownloadPath, '--strip-components=1', '-C', tempInstallDir]);
                 return tempInstallDir;
             case 'win32':
-                if (version.endsWith('nightly') || semver.gtr(version, '1.3', { includePrerelease: true })) {
+                if (version == 'nightly' || semver.gtr(version, '1.3', { includePrerelease: true })) {
                     // The installer changed in 1.4: https://github.com/JuliaLang/julia/blob/ef0c9108b12f3ae177c51037934351ffa703b0b5/NEWS.md#build-system-changes
                     yield exec.exec('powershell', ['-Command', `Start-Process -FilePath ${juliaDownloadPath} -ArgumentList "/SILENT /dir=${path.join(process.cwd(), tempInstallDir)}" -NoNewWindow -Wait`]);
                 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-julia",
-  "version": "1.5.2",
+  "version": "1.5.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-julia",
-  "version": "1.5.2",
+  "version": "1.5.1",
   "private": true,
   "description": "setup Julia action",
   "main": "lib/setup-julia.js",

src/installer.ts

@@ -66,11 +66,16 @@ export async function getJuliaVersions(versionInfo): Promise<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
+    if (semver.valid(versionInput) == versionInput) {
+        // versionInput is a valid version, use it directly
         return versionInput
     }
 
+    // nightlies
+    if (versionInput == 'nightly') {
+        return 'nightly'
+    }
+
     // Use the highest available version that matches versionInput
     let version = semver.maxSatisfying(availableReleases, versionInput)
     if (version == null) {
@@ -106,7 +111,7 @@ function getNightlyFileName(arch: string): string {
 }
 
 export function getFileInfo(versionInfo, version: string, arch: string) {
-    if (version.endsWith('nightly')) {
+    if (version == 'nightly') {
         return null
     }
 
@@ -120,17 +125,10 @@ export function getFileInfo(versionInfo, version: string, arch: string) {
 }
 
 export function getDownloadURL(fileInfo, version: string, arch: string): string {
-    const baseURL = `https://julialangnightlies-s3.julialang.org/bin/${osMap[osPlat]}/${arch}`
-
-    // release branch nightlies, e.g. 1.6-nightlies should return .../bin/linux/x64/1.6/julia-latest-linux64.tar.gz
-    const majorMinorMatches = /^(\d*.\d*)-nightly/.exec(version)
-    if (majorMinorMatches) {
-        return `${baseURL}/${majorMinorMatches[1]}/${getNightlyFileName(arch)}`
-    }
-
     // nightlies
     if (version == 'nightly') {
-        return `${baseURL}/${getNightlyFileName(arch)}`
+        const baseURL = 'https://julialangnightlies-s3.julialang.org/bin'
+        return `${baseURL}/${osMap[osPlat]}/${arch}/${getNightlyFileName(arch)}`
     }
 
     return fileInfo.url
@@ -144,7 +142,7 @@ export async function installJulia(versionInfo, version: string, arch: string):
     const juliaDownloadPath = await tc.downloadTool(downloadURL)
 
     // Verify checksum
-    if (!version.endsWith('nightly')) {
+    if (version != 'nightly') {
         const checkSum = await calculateChecksum(juliaDownloadPath)
         if (fileInfo.sha256 != checkSum) {
             throw new Error(`Checksum of downloaded file does not match the expected checksum from versions.json.\nExpected: ${fileInfo.sha256}\nGot: ${checkSum}`)
@@ -163,7 +161,7 @@ export async function installJulia(versionInfo, version: string, arch: string):
             await exec.exec('tar', ['xf', juliaDownloadPath, '--strip-components=1', '-C', tempInstallDir])
             return tempInstallDir
         case 'win32':
-            if (version.endsWith('nightly') || semver.gtr(version, '1.3', {includePrerelease: true})) {
+            if (version == 'nightly' || semver.gtr(version, '1.3', {includePrerelease: true})) {
                 // The installer changed in 1.4: https://github.com/JuliaLang/julia/blob/ef0c9108b12f3ae177c51037934351ffa703b0b5/NEWS.md#build-system-changes
                 await exec.exec('powershell', ['-Command', `Start-Process -FilePath ${juliaDownloadPath} -ArgumentList "/SILENT /dir=${path.join(process.cwd(), tempInstallDir)}" -NoNewWindow -Wait`])
             } else {