Add production dependencies & build

.github/workflows/backup.yml

@@ -9,7 +9,6 @@ on:
 jobs:
   backup:
     runs-on: ubuntu-20.04
-    timeout-minutes: 60
 
     steps:
       - name: Configure cache

.github/workflows/checkin.yml

@@ -1,16 +1,9 @@
 name: "PR Checks"
 on: [pull_request, push]
 
-concurrency:
-  # Skip intermediate builds: all builds except for builds on the `master`, `main`, or `release-*` branches
-  # Cancel intermediate builds: only pull request builds
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref != 'refs/heads/master' || github.ref != 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-') || github.run_number }}
-  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
-
 jobs:
   check_pr:
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     steps:
     - uses: actions/checkout@v1
 

.github/workflows/codeql-analysis.yml

@@ -11,12 +11,6 @@
 #
 name: "CodeQL"
 
-concurrency:
-  # Skip intermediate builds: all builds except for builds on the `master`, `main`, or `release-*` branches
-  # Cancel intermediate builds: only pull request builds
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref != 'refs/heads/master' || github.ref != 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-') || github.run_number }}
-  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
-
 on:
   push:
     branches: [ master, releases/* ]
@@ -30,7 +24,6 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
-    timeout-minutes: 60
 
     strategy:
       fail-fast: false

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

@@ -1,11 +1,5 @@
 name: Example builds (default arch)
 
-concurrency:
-  # Skip intermediate builds: all builds except for builds on the `master`, `main`, or `release-*` branches
-  # Cancel intermediate builds: only pull request builds
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref != 'refs/heads/master' || github.ref != 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-') || github.run_number }}
-  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
-
 on:
   push:
     branches: ['main', 'master', 'releases/*']
@@ -15,7 +9,6 @@ on:
 jobs:
   test:
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:

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

@@ -1,38 +0,0 @@
-name: Example builds (nightly, default arch)
-
-concurrency:
-  # Skip intermediate builds: all builds except for builds on the `master`, `main`, or `release-*` branches
-  # Cancel intermediate builds: only pull request builds
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref != 'refs/heads/master' || github.ref != 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-') || github.run_number }}
-  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
-
-on:
-  push:
-    branches: ['main', 'master', 'releases/*']
-  pull_request:
-
-jobs:
-  test:
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        julia-version: [nightly, 1.8-nightly]
-        os: [ubuntu-latest, macOS-latest, windows-latest]
-
-    steps:
-      - uses: actions/checkout@v1.0.0
-
-      - name: "Install dependencies"
-        run: |
-          npm install --legacy-peer-deps
-          npm run build
-          npm run pack
-
-      - name: "Set up Julia (${{ matrix.julia-version }})"
-        uses: ./
-        with:
-          version: ${{ matrix.julia-version }}
-      - run: julia --version
-      - run: julia --compile=min -O0 -e 'import InteractiveUtils; InteractiveUtils.versioninfo()'

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

@@ -1,11 +1,5 @@
 name: Example builds (nightly)
 
-concurrency:
-  # Skip intermediate builds: all builds except for builds on the `master`, `main`, or `release-*` branches
-  # Cancel intermediate builds: only pull request builds
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref != 'refs/heads/master' || github.ref != 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-') || github.run_number }}
-  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
-
 on:
   push:
     branches: ['main', 'master', 'releases/*']
@@ -16,7 +10,6 @@ on:
 jobs:
   test:
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
@@ -27,10 +20,10 @@ jobs:
         exclude:
           - os: macOS-latest
             julia-arch: x86
-
+    
     steps:
       - uses: actions/checkout@v1.0.0
-
+      
       - name: "Install dependencies"
         run: |
           npm install --legacy-peer-deps

.github/workflows/example-builds.yml

@@ -1,11 +1,5 @@
 name: Example builds
 
-concurrency:
-  # Skip intermediate builds: all builds except for builds on the `master`, `main`, or `release-*` branches
-  # Cancel intermediate builds: only pull request builds
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.ref != 'refs/heads/master' || github.ref != 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-') || github.run_number }}
-  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
-
 on:
   push:
     branches: ['main', 'master', 'releases/*']
@@ -15,7 +9,6 @@ on:
 jobs:
   test:
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
     strategy:
       fail-fast: false
       matrix:
@@ -26,7 +19,7 @@ jobs:
         exclude:
           - os: macOS-latest
             julia-arch: x86
-
+    
     steps:
       - uses: actions/checkout@v1.0.0
 

dist/index.js

@@ -4153,14 +4153,6 @@ const fs = __importStar(__webpack_require__(747));
 const https = __importStar(__webpack_require__(211));
 const path = __importStar(__webpack_require__(622));
 const installer = __importStar(__webpack_require__(749));
-const archSynonyms = {
-    'x86': 'x86',
-    'X86': 'x86',
-    'x64': 'x64',
-    'X64': 'x64',
-    'aarch64': 'aarch64',
-    'ARM64': 'aarch64'
-};
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -4181,7 +4173,7 @@ function run() {
             }
             // Inputs
             const versionInput = core.getInput('version');
-            const originalArchInput = core.getInput('arch');
+            const arch = 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 }}`.
             // In that case, we want the action to fail, rather than trying to download julia from an URL that's missing parts and 404ing.
@@ -4190,10 +4182,9 @@ function run() {
             if (!versionInput) {
                 throw new Error('Version input must not be null');
             }
-            if (!originalArchInput) {
+            if (!arch) {
                 throw new Error(`Arch input must not be null`);
             }
-            const arch = archSynonyms[originalArchInput];
             const versionInfo = yield installer.getJuliaVersionInfo();
             const availableReleases = yield installer.getJuliaVersions(versionInfo);
             const version = installer.getJuliaVersion(availableReleases, versionInput);
@@ -4277,8 +4268,11 @@ const osMap = {
 };
 const archMap = {
     'x86': 'i686',
+    'X86': 'i686',
     'x64': 'x86_64',
-    'aarch64': 'aarch64'
+    'X64': 'x86_64',
+    'aarch64': 'aarch64',
+    'ARM64': 'aarch64'
 };
 // Store information about the environment
 const osPlat = os.platform(); // possible values: win32 (Windows), linux (Linux), darwin (macOS)

lib/installer.js

@@ -32,8 +32,11 @@ const osMap = {
 };
 const archMap = {
     'x86': 'i686',
+    'X86': 'i686',
     'x64': 'x86_64',
-    'aarch64': 'aarch64'
+    'X64': 'x86_64',
+    'aarch64': 'aarch64',
+    'ARM64': 'aarch64'
 };
 // Store information about the environment
 const osPlat = os.platform(); // possible values: win32 (Windows), linux (Linux), darwin (macOS)

lib/setup-julia.js

@@ -21,14 +21,6 @@ const fs = __importStar(require("fs"));
 const https = __importStar(require("https"));
 const path = __importStar(require("path"));
 const installer = __importStar(require("./installer"));
-const archSynonyms = {
-    'x86': 'x86',
-    'X86': 'x86',
-    'x64': 'x64',
-    'X64': 'x64',
-    'aarch64': 'aarch64',
-    'ARM64': 'aarch64'
-};
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -49,7 +41,7 @@ function run() {
             }
             // Inputs
             const versionInput = core.getInput('version');
-            const originalArchInput = core.getInput('arch');
+            const arch = 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 }}`.
             // In that case, we want the action to fail, rather than trying to download julia from an URL that's missing parts and 404ing.
@@ -58,10 +50,9 @@ function run() {
             if (!versionInput) {
                 throw new Error('Version input must not be null');
             }
-            if (!originalArchInput) {
+            if (!arch) {
                 throw new Error(`Arch input must not be null`);
             }
-            const arch = archSynonyms[originalArchInput];
             const versionInfo = yield installer.getJuliaVersionInfo();
             const availableReleases = yield installer.getJuliaVersions(versionInfo);
             const version = installer.getJuliaVersion(availableReleases, versionInput);

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "setup-julia",
-  "version": "1.8.1",
+  "version": "1.8.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "setup-julia",
-      "version": "1.8.1",
+      "version": "1.8.0",
       "license": "MIT",
       "dependencies": {
         "@actions/core": "^1.2.6",

package.json

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

src/installer.ts

@@ -18,8 +18,11 @@ const osMap = {
 }
 const archMap = {
     'x86': 'i686',
+    'X86': 'i686',
     'x64': 'x86_64',
-    'aarch64': 'aarch64'
+    'X64': 'x86_64',
+    'aarch64': 'aarch64',
+    'ARM64': 'aarch64'
 }
 
 // Store information about the environment

src/setup-julia.ts

@@ -8,15 +8,6 @@ import * as path from 'path'
 
 import * as installer from './installer'
 
-const archSynonyms = {
-    'x86': 'x86',
-    'X86': 'x86',
-    'x64': 'x64',
-    'X64': 'x64',
-    'aarch64': 'aarch64',
-    'ARM64': 'aarch64'
-}
-
 async function run() {
     try {
         // Debugging info
@@ -39,7 +30,7 @@ async function run() {
 
         // Inputs
         const versionInput = core.getInput('version')
-        const originalArchInput = core.getInput('arch')
+        const arch = 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 }}`.
@@ -49,12 +40,10 @@ async function run() {
         if (!versionInput) {
             throw new Error('Version input must not be null')
         }
-        if (!originalArchInput) {
+        if (!arch) {
             throw new Error(`Arch input must not be null`)
         }
 
-        const arch = archSynonyms[originalArchInput]
-
         const versionInfo = await installer.getJuliaVersionInfo()
         const availableReleases = await installer.getJuliaVersions(versionInfo)
         const version = installer.getJuliaVersion(availableReleases, versionInput)