From ea910bdb027cedc9b8e0a5a5f1cb9047d981a135 Mon Sep 17 00:00:00 2001
From: Fernando Chorney <fernando.chorney@invenia.ca>
Date: Mon, 18 Jan 2021 15:16:13 -0600
Subject: [PATCH 1/3] Automatically fix CI tests and cache steps

---
 .github/workflows/CI.yml           | 24 +++++++-----------------
 .github/workflows/JuliaNightly.yml | 10 ++++------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 416611f..7f9a333 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -24,43 +24,33 @@ jobs:
         arch:
           - x64
           - x86
-        test_type:
-          - basic
-          - userimage
         exclude:
           # Test 32-bit only on Linux
           - os: macOS-latest
             arch: x86
           - os: windows-latest
             arch: x86
-          # Don't run userimage tests on windows
-          - os: windows-latest
-            test_type: userimage
         include:
-          # Add a 1.3 job because that's what Invenia actually uses
-          - os: ubuntu-latest
-            version: 1.3
-            arch: x64
-            test_type: basic
+          # Add a 1.5 job because that's what Invenia actually uses
           - os: ubuntu-latest
-            version: 1.3
+            version: 1.5
             arch: x64
-            test_type: userimage
     steps:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
-      - uses: actions/cache@v1
+      - uses: actions/cache@v2
         env:
           cache-name: cache-artifacts
         with:
           path: ~/.julia/artifacts
-          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
+          key: ${{ runner.os }}-${{ matrix.arch }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
           restore-keys: |
-            ${{ runner.os }}-test-${{ env.cache-name }}-
-            ${{ runner.os }}-test-
+            ${{ runner.os }}-${{ matrix.arch }}-test-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ matrix.arch }}-test-
+            ${{ runner.os }}-${{ matrix.arch }}-
             ${{ runner.os }}-
       - uses: julia-actions/julia-buildpkg@latest
       - uses: julia-actions/julia-runtest@latest
diff --git a/.github/workflows/JuliaNightly.yml b/.github/workflows/JuliaNightly.yml
index d3c8250..351eec9 100644
--- a/.github/workflows/JuliaNightly.yml
+++ b/.github/workflows/JuliaNightly.yml
@@ -13,16 +13,14 @@ jobs:
         with:
           version: nightly
           arch: x64
-      - uses: actions/cache@v1
+      - uses: actions/cache@v2
         env:
-          cache-name: cache-artifacts
+          cache-name: julia-nightly-cache-artifacts
         with:
           path: ~/.julia/artifacts
-          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
+          key: ${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
           restore-keys: |
-            ${{ runner.os }}-test-${{ env.cache-name }}-
-            ${{ runner.os }}-test-
-            ${{ runner.os }}-
+            ${{ env.cache-name }}-
       - uses: julia-actions/julia-buildpkg@latest
       - uses: julia-actions/julia-runtest@latest
       - uses: julia-actions/julia-processcoverage@v1

From c15bd6c64a75b618c4b13392451eaf0e83972b5e Mon Sep 17 00:00:00 2001
From: Fernando Chorney <fernando.chorney@invenia.ca>
Date: Mon, 18 Jan 2021 16:54:51 -0600
Subject: [PATCH 2/3] Revert matrix change

---
 .github/workflows/CI.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 7f9a333..905191d 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -24,17 +24,28 @@ jobs:
         arch:
           - x64
           - x86
+        test_type:
+          - basic
+          - userimage
         exclude:
           # Test 32-bit only on Linux
           - os: macOS-latest
             arch: x86
           - os: windows-latest
             arch: x86
+          # Don't run userimage tests on windows
+          - os: windows-latest
+            test_type: userimage
         include:
           # Add a 1.5 job because that's what Invenia actually uses
           - os: ubuntu-latest
             version: 1.5
             arch: x64
+            test_type: basic
+          - os: ubuntu-latest
+            version: 1.5
+            arch: x64
+            test_type: userimage
     steps:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1
@@ -46,10 +57,11 @@ jobs:
           cache-name: cache-artifacts
         with:
           path: ~/.julia/artifacts
-          key: ${{ runner.os }}-${{ matrix.arch }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
+          key: ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.test_type }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.arch }}-test-${{ env.cache-name }}-
-            ${{ runner.os }}-${{ matrix.arch }}-test-
+            ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.test_type }}-test-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.test_type }}-test-
+            ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.test_type }}-
             ${{ runner.os }}-${{ matrix.arch }}-
             ${{ runner.os }}-
       - uses: julia-actions/julia-buildpkg@latest

From b4193dc4488b517e851ff54e0ee9d8ad7d25a436 Mon Sep 17 00:00:00 2001
From: Fernando Chorney <fernando.chorney@invenia.ca>
Date: Mon, 18 Jan 2021 16:57:02 -0600
Subject: [PATCH 3/3] I don't think test_type needs to be added to cache

---
 .github/workflows/CI.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 905191d..d5e0461 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -57,11 +57,10 @@ jobs:
           cache-name: cache-artifacts
         with:
           path: ~/.julia/artifacts
-          key: ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.test_type }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
+          key: ${{ runner.os }}-${{ matrix.arch }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.test_type }}-test-${{ env.cache-name }}-
-            ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.test_type }}-test-
-            ${{ runner.os }}-${{ matrix.arch }}-${{ matrix.test_type }}-
+            ${{ runner.os }}-${{ matrix.arch }}-test-${{ env.cache-name }}-
+            ${{ runner.os }}-${{ matrix.arch }}-test-
             ${{ runner.os }}-${{ matrix.arch }}-
             ${{ runner.os }}-
       - uses: julia-actions/julia-buildpkg@latest