Add production dependencies & build

* Support release nightlies

See #62

* Replace == nightly with endsWith nightly

* Use majorMinorMatch, not full match

* Replace more (in-)equality checks

* Reduce number of duplicate CI builds

* Add example to docs

* Tidy up nightly conditions

.github/CODEOWNERS

@@ -0,0 +1 @@
+*       @julia-actions/reviewers

.github/workflows/backup.yml

@@ -0,0 +1,33 @@
+name: Backup
+
+on:
+  schedule:
+    - cron: '5 4 * * 0'
+
+  workflow_dispatch:
+
+jobs:
+  backup:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Configure cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ${{ env.GITHUB_WORKSPACE }}
+            ~/.cache/restic
+          key: ${{ runner.os }}
+
+      - name: Install the correct Python version
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.x'
+
+      - name: Run backup action
+        uses: julia-actions/restic-action@main
+        env: # Options: https://restic.readthedocs.io/en/latest/040_backup.html#environment-variables
+          RESTIC_REPOSITORY: b2:${{ secrets.B2_BUCKET }}:${{ github.repository }}
+          RESTIC_PASSWORD: ${{ secrets.RESTIC_PASSWORD }}
+          B2_ACCOUNT_ID: ${{ secrets.B2_ACCOUNT_ID }}
+          B2_ACCOUNT_KEY: ${{ secrets.B2_ACCOUNT_KEY }}

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,67 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master, releases/* ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '32 22 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

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

@@ -2,6 +2,7 @@ name: Example builds (nightly)
 
 on:
   push:
+    branches: ['main', 'master', 'releases/*']
   pull_request:
   schedule:
     - cron: '37 17 * * *'
@@ -12,6 +13,7 @@ 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
@@ -28,10 +30,10 @@ jobs:
           npm run build
           npm run pack
 
-      - name: "Set up Julia (nightly)"
+      - name: "Set up Julia (${{ matrix.julia-version }})"
         uses: ./
         with:
-          version: nightly
+          version: ${{ matrix.julia-version }}
           arch: ${{ matrix.julia-arch }}
           show-versioninfo: 'true'
       - run: julia --version

.github/workflows/example-builds.yml

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

.gitignore

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

README.md

@@ -1,5 +1,6 @@
 # setup-julia Action
 
+[![CodeQL](https://github.com/julia-actions/setup-julia/workflows/CodeQL/badge.svg)](https://securitylab.github.com/tools/codeql)
 [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=julia-actions/setup-julia)](https://dependabot.com)
 
 This action sets up a Julia environment for use in actions by downloading a specified version of Julia and adding it to PATH.
@@ -7,18 +8,64 @@ This action sets up a Julia environment for use in actions by downloading a spec
 ## Table of Contents
 - [Table of Contents](#table-of-contents)
 - [Usage](#usage)
+  - [Inputs](#inputs)
+  - [Outputs](#outputs)
   - [Basic](#basic)
   - [Julia Versions](#julia-versions)
   - [Matrix Testing](#matrix-testing)
+  - [versioninfo](#versioninfo)
 - [Versioning](#versioning)
 - [Debug logs](#debug-logs)
 - [Third party information](#third-party-information)
 
 ## Usage
 
-See [action.yml](action.yml).
+### Inputs
 
-You can find a list of example workflows making use of this action here: [julia-actions/example-workflows](https://github.com/julia-actions/example-workflows).
+```yaml
+- uses: julia-actions/setup-julia@v1
+  with:
+    # The Julia version that will be installed and added as `julia` to the PATH.
+    # See "Julia Versions" below for a list of valid values.
+    #
+    # Warning: It is strongly recommended to wrap this value in quotes.
+    #          Otherwise, the YAML parser used by GitHub Actions parses certain
+    #          versions as numbers which causes the wrong version to be selected.
+    #          For example, `1.0` may be parsed as `1`.
+    #
+    # Default: '1'
+    version: ''
+
+    # The architecture of the Julia binaries.
+    #
+    # Supported values: x64 | x86
+    #
+    # Default: x64
+    arch: ''
+
+    # If true, display the output of InteractiveUtils.versioninfo() after installing.
+    # See "versioninfo" below for example usage.
+    #
+    # Default: false
+    show-versioninfo: ''
+```
+
+### Outputs
+
+```yaml
+outputs:
+  # The installed Julia version.
+  # May vary from the version input if a version range was given as input.
+  #
+  # Example output: '1.5.3'
+
+  julia-version: ''
+  # Path to the directory containing the Julia executable.
+  # Equivalent to JULIA_BINDIR: https://docs.julialang.org/en/v1/manual/environment-variables/#JULIA_BINDIR
+  #
+  # Example output: '/opt/hostedtoolcache/julia/1.5.3/x64/bin'
+  julia-bindir: ''
+```
 
 ### Basic
 
@@ -35,7 +82,7 @@ steps:
 
 You can either specify specific Julia versions or version ranges. If you specify a version range, the **highest** available Julia version that matches the range will be selected.
 
-**Warning:** It is strongly recommended to wrap versions in quotes. Otherwise, the YAML parser used by GitHub Actions parses certain versions as numbers which causes the wrong version to be selected. For example, `1.0` is parsed as `1`.
+**Warning:** It is strongly recommended to wrap versions in quotes. Otherwise, the YAML parser used by GitHub Actions parses certain versions as numbers which causes the wrong version to be selected. For example, `1.0` may be parsed as `1`.
 
 #### Examples
 
@@ -46,6 +93,7 @@ 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).
 
@@ -129,6 +177,21 @@ jobs:
         shell: bash
 ```
 
+### versioninfo
+
+By default, only a brief version identifier is printed in the run log. You can display the full `versioninfo` by adding `show-versioninfo`.
+Here's an example that prints this information just for `nightly`:
+
+```yaml
+    - uses: julia-actions/setup-julia@v1
+      with:
+        version: ${{ matrix.version }}
+        arch: ${{ matrix.arch }}
+        show-versioninfo: ${{ matrix.version == 'nightly' }}
+ ```
+ 
+You use `'true'` if you want it printed for all Julia versions.
+
 ## Versioning
 
 This action follows [GitHub's advice](https://help.github.com/en/articles/about-actions#versioning-your-action) on versioning actions, with an additional `latest` tag.
@@ -141,11 +204,11 @@ You can specify commits, branches or tags in your workflows as follows:
 
 ```yaml
 steps:
-  - uses: julia-actions/setup-julia@d26d1111976eae5f00db04f0515ab744ec9cd79e # commit SHA of the tagged 1.3.1 commit
+  - uses: julia-actions/setup-julia@d3ce119a16594ea9e5d7974813970c73b6ab9e94 # commit SHA of the tagged 1.4.1 commit
-  - uses: julia-actions/setup-julia@master  # branch
   - uses: julia-actions/setup-julia@latest  # latest version tag (may break existing workflows)
   - uses: julia-actions/setup-julia@v1      # major version tag
-  - uses: julia-actions/setup-julia@v0.1.0  # specific version tag
+  - uses: julia-actions/setup-julia@v1.4    # minor version tag
+  - uses: julia-actions/setup-julia@v1.4.1  # specific version tag
 ```
 
 If your workflow requires access to secrets, you should always pin it to a commit SHA instead of a tag.

action.yml

@@ -14,6 +14,8 @@ inputs:
     required: false
     default: 'false'
 outputs:
+  julia-version:
+    description: 'The installed Julia version. May vary from the version input if a version range was given as input.'
   julia-bindir:
     description: 'Path to the directory containing the Julia executable. Equivalent to JULIA_BINDIR: https://docs.julialang.org/en/v1/manual/environment-variables/#JULIA_BINDIR'
 runs:

lib/installer.js

@@ -78,14 +78,10 @@ function getJuliaVersions(versionInfo) {
 }
 exports.getJuliaVersions = getJuliaVersions;
 function getJuliaVersion(availableReleases, versionInput) {
-    if (semver.valid(versionInput) == versionInput) {
+    if (semver.valid(versionInput) == versionInput || versionInput.endsWith('nightly')) {
-        // versionInput is a valid version, use it directly
+        // versionInput is a valid version or a nightly 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) {
@@ -119,7 +115,7 @@ function getNightlyFileName(arch) {
     return `julia-latest${versionExt}.${ext}`;
 }
 function getFileInfo(versionInfo, version, arch) {
-    if (version == 'nightly') {
+    if (version.endsWith('nightly')) {
         return null;
     }
     for (let file of versionInfo[version].files) {
@@ -131,10 +127,15 @@ 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') {
-        const baseURL = 'https://julialangnightlies-s3.julialang.org/bin';
+        return `${baseURL}/${getNightlyFileName(arch)}`;
-        return `${baseURL}/${osMap[osPlat]}/${arch}/${getNightlyFileName(arch)}`;
     }
     return fileInfo.url;
 }
@@ -147,7 +148,7 @@ function installJulia(versionInfo, version, arch) {
         core.debug(`downloading Julia from ${downloadURL}`);
         const juliaDownloadPath = yield tc.downloadTool(downloadURL);
         // Verify checksum
-        if (version != 'nightly') {
+        if (!version.endsWith('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}`);
@@ -165,7 +166,7 @@ function installJulia(versionInfo, version, arch) {
                 yield exec.exec('tar', ['xf', juliaDownloadPath, '--strip-components=1', '-C', tempInstallDir]);
                 return tempInstallDir;
             case 'win32':
-                if (version == 'nightly' || semver.gtr(version, '1.3', { includePrerelease: true })) {
+                if (version.endsWith('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/setup-julia.js

@@ -58,6 +58,7 @@ function run() {
             const availableReleases = yield installer.getJuliaVersions(versionInfo);
             const version = installer.getJuliaVersion(availableReleases, versionInput);
             core.debug(`selected Julia version: ${arch}/${version}`);
+            core.setOutput('julia-version', version);
             // Search in cache
             let juliaPath;
             juliaPath = tc.find('julia', version, arch);
@@ -77,11 +78,15 @@ function run() {
             core.addPath(path.join(juliaPath, 'bin'));
             // Set output
             core.setOutput('julia-bindir', path.join(juliaPath, 'bin'));
-            // Test if Julia has been installed
+            // Test if Julia has been installed and print the version
-            exec.exec('julia', ['--version']);
-            // If enabled, also show the full version info
             if (core.getInput('show-versioninfo') == 'true') {
-                exec.exec('julia', ['-e', 'using InteractiveUtils; versioninfo()']);
+                // If enabled, show the full version info
+                // --compile=min -O0 reduces the time from ~1.8-1.9s to ~0.8-0.9s
+                exec.exec('julia', ['--compile=min', '-O0', '-e', 'using InteractiveUtils; versioninfo()']);
+            }
+            else {
+                // Otherwise only print julia --version to save time
+                exec.exec('julia', ['--version']);
             }
         }
         catch (error) {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-julia",
-  "version": "1.4.1",
+  "version": "1.5.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2861,12 +2861,6 @@
           "dev": true,
           "optional": true
         },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
@@ -3449,6 +3443,13 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
+    "ini": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
+      "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==",
+      "dev": true,
+      "optional": true
+    },
     "invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",

package.json

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

src/installer.ts

@@ -66,16 +66,11 @@ export async function getJuliaVersions(versionInfo): Promise<string[]> {
 }
 
 export function getJuliaVersion(availableReleases: string[], versionInput: string): string {
-    if (semver.valid(versionInput) == versionInput) {
+    if (semver.valid(versionInput) == versionInput || versionInput.endsWith('nightly')) {
-        // versionInput is a valid version, use it directly
+        // versionInput is a valid version or a nightly 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) {
@@ -111,7 +106,7 @@ function getNightlyFileName(arch: string): string {
 }
 
 export function getFileInfo(versionInfo, version: string, arch: string) {
-    if (version == 'nightly') {
+    if (version.endsWith('nightly')) {
         return null
     }
 
@@ -125,10 +120,17 @@ 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') {
-        const baseURL = 'https://julialangnightlies-s3.julialang.org/bin'
+        return `${baseURL}/${getNightlyFileName(arch)}`
-        return `${baseURL}/${osMap[osPlat]}/${arch}/${getNightlyFileName(arch)}`
     }
 
     return fileInfo.url
@@ -142,7 +144,7 @@ export async function installJulia(versionInfo, version: string, arch: string):
     const juliaDownloadPath = await tc.downloadTool(downloadURL)
 
     // Verify checksum
-    if (version != 'nightly') {
+    if (!version.endsWith('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}`)
@@ -161,7 +163,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 == 'nightly' || semver.gtr(version, '1.3', {includePrerelease: true})) {
+            if (version.endsWith('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 {

src/setup-julia.ts

@@ -48,6 +48,7 @@ async function run() {
         const availableReleases = await installer.getJuliaVersions(versionInfo)
         const version = installer.getJuliaVersion(availableReleases, versionInput)
         core.debug(`selected Julia version: ${arch}/${version}`)
+        core.setOutput('julia-version', version)
 
         // Search in cache
         let juliaPath: string;
@@ -73,12 +74,14 @@ async function run() {
         // Set output
         core.setOutput('julia-bindir', path.join(juliaPath, 'bin'))
 
-        // Test if Julia has been installed
+        // Test if Julia has been installed and print the version
-        exec.exec('julia', ['--version'])
-
-        // If enabled, also show the full version info
         if (core.getInput('show-versioninfo') == 'true') {
-            exec.exec('julia', ['-e', 'using InteractiveUtils; versioninfo()'])
+            // If enabled, show the full version info
+            // --compile=min -O0 reduces the time from ~1.8-1.9s to ~0.8-0.9s
+            exec.exec('julia', ['--compile=min', '-O0', '-e', 'using InteractiveUtils; versioninfo()'])
+        } else {
+            // Otherwise only print julia --version to save time
+            exec.exec('julia', ['--version'])
         }
     } catch (error) {
         core.setFailed(error.message)