From 91f39f3385526f099590a649828c43c0d7f094bb Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 10 Aug 2024 12:49:08 +0200
Subject: [PATCH 1/2] update GHA versions and fix keepcachefresh

---
 .github/workflows/ExportNotebooks.yml | 20 ++++++++++----------
 .github/workflows/KeepCacheFresh.yml  | 10 ++++++++--
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ExportNotebooks.yml b/.github/workflows/ExportNotebooks.yml
index 05d90821..cad9a295 100644
--- a/.github/workflows/ExportNotebooks.yml
+++ b/.github/workflows/ExportNotebooks.yml
@@ -13,15 +13,15 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Checkout Fall 24 source
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: 🙌 Install Julia
-              uses: julia-actions/setup-julia@v1
+              uses: julia-actions/setup-julia@v2
               with:
                   version: "1.10.4"
 
             - name: ⏱ Cache notebook states
-              uses: actions/cache@v2
+              uses: actions/cache@v4
               with:
                 path: _cache
                 key: ${{ runner.os }}-pluto_state_cache-v3-${{ hashFiles('**/Project.toml', '**/Manifest.toml') }}-${{ github.run_id }}
@@ -29,7 +29,7 @@ jobs:
                     ${{ runner.os }}-pluto_state_cache-v3-${{ hashFiles('**/Project.toml', '**/Manifest.toml') }}
 
             - name: ⏱ Cache .julia
-              uses: actions/cache@v2
+              uses: actions/cache@v4
               with:
                 path: ~/.julia
                 key: ${{ runner.os }}-dotjulia-v1-${{ hashFiles('**/Project.toml', '**/Manifest.toml') }}-${{ github.run_id }}
@@ -37,7 +37,7 @@ jobs:
                     ${{ runner.os }}-dotjulia-v1-${{ hashFiles('**/Project.toml', '**/Manifest.toml') }}
 
             - name: 📅 Checkout Fall20, Spring21, Fall22, Fall23 output
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
               with:
                   path: Fall23-output
                   ref: Fall23-output
@@ -51,7 +51,7 @@ jobs:
 
             
             - name: 📰 Upload site generation report
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v4
               if: always()
               with:
                 path: generation_report.html
@@ -67,8 +67,8 @@ jobs:
                 mv extra_outputs/* www
 
             - name: 🚀 Deploy to GitHub Pages
-              uses: JamesIves/github-pages-deploy-action@releases/v3
+              uses: JamesIves/github-pages-deploy-action@4
               with:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                  BRANCH: Fall24-output
-                  FOLDER: www
+                  token: ${{ secrets.GITHUB_TOKEN }}
+                  branch: Fall24-output
+                  folder: www
diff --git a/.github/workflows/KeepCacheFresh.yml b/.github/workflows/KeepCacheFresh.yml
index 394456ef..c4afa9c8 100644
--- a/.github/workflows/KeepCacheFresh.yml
+++ b/.github/workflows/KeepCacheFresh.yml
@@ -2,13 +2,19 @@ name: Keep caches fresh
 on:
     schedule:
         - cron: "5 4 1/4 * *" # every 4 days
+concurrency:
+    group: export
+    cancel-in-progress: false
 
 jobs:
     build-and-deploy:
         runs-on: ubuntu-latest
         steps:
+            - name: Checkout Fall 24 source
+              uses: actions/checkout@v4
+
             - name: ⏱ Cache notebook states
-              uses: actions/cache@v2
+              uses: actions/cache@v4
               with:
                 path: _cache
                 key: ${{ runner.os }}-pluto_state_cache-v3-${{ hashFiles('**/Project.toml', '**/Manifest.toml') }}-${{ github.run_id }}
@@ -16,7 +22,7 @@ jobs:
                     ${{ runner.os }}-pluto_state_cache-v3-${{ hashFiles('**/Project.toml', '**/Manifest.toml') }}
 
             - name: ⏱ Cache .julia
-              uses: actions/cache@v2
+              uses: actions/cache@v4
               with:
                 path: ~/.julia
                 key: ${{ runner.os }}-dotjulia-v1-${{ hashFiles('**/Project.toml', '**/Manifest.toml') }}-${{ github.run_id }}

From 8be36c8c654a0a36b8311f7874aeaf0a93a8f1fe Mon Sep 17 00:00:00 2001
From: Fons van der Plas <fonsvdplas@gmail.com>
Date: Sat, 10 Aug 2024 12:50:21 +0200
Subject: [PATCH 2/2] Update ExportNotebooks.yml

---
 .github/workflows/ExportNotebooks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ExportNotebooks.yml b/.github/workflows/ExportNotebooks.yml
index cad9a295..3ad92cc4 100644
--- a/.github/workflows/ExportNotebooks.yml
+++ b/.github/workflows/ExportNotebooks.yml
@@ -67,7 +67,7 @@ jobs:
                 mv extra_outputs/* www
 
             - name: 🚀 Deploy to GitHub Pages
-              uses: JamesIves/github-pages-deploy-action@4
+              uses: JamesIves/github-pages-deploy-action@v4
               with:
                   token: ${{ secrets.GITHUB_TOKEN }}
                   branch: Fall24-output