From ebf52f92512b1517184d2fe4b9b2b8b73f1deef3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 00:42:23 +0000
Subject: [PATCH 1/2] Bump actions/cache from 3 to 4

Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/bsd.yaml                    |  6 ++--
 .github/workflows/build-and-test-Linux.yaml   |  2 +-
 .github/workflows/build-and-test-Xen.yaml     |  2 +-
 .github/workflows/csmith.yaml                 |  2 +-
 .../pull-request-check-rust-api.yaml          |  4 +--
 .github/workflows/pull-request-checks.yaml    | 32 +++++++++----------
 .github/workflows/release-packages.yaml       |  6 ++--
 7 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/bsd.yaml b/.github/workflows/bsd.yaml
index 797b8f2b416..7ec7b16af8d 100644
--- a/.github/workflows/bsd.yaml
+++ b/.github/workflows/bsd.yaml
@@ -14,7 +14,7 @@ jobs:
         with:
           submodules: recursive
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: freebsd-13.2-gmake-${{ github.ref }}-${{ github.sha }}-PR
@@ -75,7 +75,7 @@ jobs:
         with:
           submodules: recursive
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: openbsd-7.4-gmake-${{ github.ref }}-${{ github.sha }}-PR
@@ -136,7 +136,7 @@ jobs:
         with:
           submodules: recursive
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: netbsd-9.3-gmake-${{ github.ref }}-${{ github.sha }}-PR
diff --git a/.github/workflows/build-and-test-Linux.yaml b/.github/workflows/build-and-test-Linux.yaml
index 2ab7e0a4dfd..35dc263d1d1 100644
--- a/.github/workflows/build-and-test-Linux.yaml
+++ b/.github/workflows/build-and-test-Linux.yaml
@@ -25,7 +25,7 @@ jobs:
           sudo apt-get install --no-install-recommends -y gawk jq
 
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-20.04-make-clang-${{ github.ref }}-${{ github.sha }}-KERNEL
diff --git a/.github/workflows/build-and-test-Xen.yaml b/.github/workflows/build-and-test-Xen.yaml
index 66779668fcc..b80a59c43db 100644
--- a/.github/workflows/build-and-test-Xen.yaml
+++ b/.github/workflows/build-and-test-Xen.yaml
@@ -24,7 +24,7 @@ jobs:
           sudo apt-get install --no-install-recommends -y libgtk2.0-dev libyajl-dev time ccache clang-10 clang++-10
 
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-20.04-make-clang-${{ github.ref }}-${{ github.sha }}-XEN
diff --git a/.github/workflows/csmith.yaml b/.github/workflows/csmith.yaml
index a5e144ac055..2dbeca8306c 100644
--- a/.github/workflows/csmith.yaml
+++ b/.github/workflows/csmith.yaml
@@ -23,7 +23,7 @@ jobs:
           sudo apt-get install --no-install-recommends -y csmith libcsmith-dev
           make -C src minisat2-download
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-20.04-make-clang-${{ github.ref }}-${{ github.sha }}-CSMITH
diff --git a/.github/workflows/pull-request-check-rust-api.yaml b/.github/workflows/pull-request-check-rust-api.yaml
index 8a48bcfa98f..3522248b99e 100644
--- a/.github/workflows/pull-request-check-rust-api.yaml
+++ b/.github/workflows/pull-request-check-rust-api.yaml
@@ -33,7 +33,7 @@ jobs:
       - name: Log cargo/rust version
         run: cargo --version
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-22.04-cmake-clang-${{ github.ref }}-${{ github.sha }}-PR
@@ -79,7 +79,7 @@ jobs:
       - name: Log cargo/rust version
         run: cargo --version
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-Release-Minisat-${{ github.ref }}-${{ github.sha }}-PR-Rust-API
diff --git a/.github/workflows/pull-request-checks.yaml b/.github/workflows/pull-request-checks.yaml
index f9eacdf8071..88e9cafadcf 100644
--- a/.github/workflows/pull-request-checks.yaml
+++ b/.github/workflows/pull-request-checks.yaml
@@ -32,7 +32,7 @@ jobs:
           mv cvc5 /usr/local/bin
           cvc5 --version
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-20.04-make-${{ github.ref }}-${{ github.sha }}-PR
@@ -117,7 +117,7 @@ jobs:
           mv cvc5 /usr/local/bin
           cvc5 --version
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-20.04-make-clang-${{ github.ref }}-${{ github.sha }}-PR
@@ -181,7 +181,7 @@ jobs:
       - name: Confirm z3 solver is available and log the version installed
         run: z3 --version
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-20.04-make-clang-${{ github.ref }}-${{ github.sha }}-PR
@@ -225,7 +225,7 @@ jobs:
           mv cvc5 /usr/local/bin
           cvc5 --version
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-20.04-Release-${{ github.ref }}-${{ github.sha }}-PR
@@ -296,7 +296,7 @@ jobs:
           mv cvc5 /usr/local/bin
           cvc5 --version
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-22.04-make-clang-${{ github.ref }}-${{ github.sha }}-PR
@@ -361,7 +361,7 @@ jobs:
           mv cvc5 /usr/local/bin
           cvc5 --version
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-22.04-Release-${{ github.ref }}-${{ github.sha }}-PR
@@ -420,7 +420,7 @@ jobs:
           mv cvc5 /usr/local/bin
           cvc5 --version
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-22.04-Release-gcc-13-${{ github.ref }}-${{ github.sha }}-PR
@@ -466,7 +466,7 @@ jobs:
           mv cvc5 /usr/local/bin
           cvc5 --version
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-22.04-Release-32-${{ github.ref }}-${{ github.sha }}-PR
@@ -504,7 +504,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install --no-install-recommends -yq cmake ninja-build gcc g++ maven flex bison libxml2-utils ccache z3
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-20.04-Release-${{ github.ref }}-${{ github.sha }}-PR
@@ -550,7 +550,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install --no-install-recommends -yq cmake ninja-build gcc g++ maven flex bison libxml2-utils ccache z3
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-20.04-Release-${{ github.ref }}-${{ github.sha }}-PR
@@ -590,7 +590,7 @@ jobs:
           mv cvc5 /usr/local/bin
           cvc5 --version
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-make-${{ github.ref }}-${{ github.sha }}-PR
@@ -641,7 +641,7 @@ jobs:
           mv cvc5 /usr/local/bin
           cvc5 --version
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-Release-Glucose-${{ github.ref }}-${{ github.sha }}-PR
@@ -698,7 +698,7 @@ jobs:
       - name: Confirm cvc5 solver is available and log the version installed
         run: cvc5 --version
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-msbuild-${{ github.ref }}-${{ github.sha }}-PR
@@ -756,7 +756,7 @@ jobs:
       - name: Initialise Developer Command Line
         uses: ilammy/msvc-dev-cmd@v1
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-msbuild-make-${{ github.ref }}-${{ github.sha }}-PR
@@ -811,7 +811,7 @@ jobs:
           nuget install clcache -OutputDirectory "c:\tools" -ExcludeVersion -Version 4.1.0
           echo "c:\tools\clcache\clcache-4.1.0" >> $env:GITHUB_PATH
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-msbuild-${{ github.ref }}-${{ github.sha }}-PKG
@@ -928,7 +928,7 @@ jobs:
           mv cvc5 /usr/local/bin
           cvc5 --version
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-20.04-Coverage-${{ github.ref }}-${{ github.sha }}-PR
diff --git a/.github/workflows/release-packages.yaml b/.github/workflows/release-packages.yaml
index a8e08f94804..5ac5ce434de 100644
--- a/.github/workflows/release-packages.yaml
+++ b/.github/workflows/release-packages.yaml
@@ -27,7 +27,7 @@ jobs:
           mv cvc5 /usr/local/bin
           cvc5 --version
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-22.04-Release-${{ github.ref }}-${{ github.sha }}-RELEASEPKG
@@ -97,7 +97,7 @@ jobs:
           mv cvc5 /usr/local/bin
           cvc5 --version
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-20.04-Release-${{ github.ref }}-${{ github.sha }}-RELEASEPKG
@@ -199,7 +199,7 @@ jobs:
           echo "$(Split-Path -Path $(Get-ChildItem -Path "${env:ProgramFiles(x86)}\Windows Kits\10\App Certification Kit\signtool.exe"))" >> $env:GITHUB_PATH
           echo "pfxcert=$([string](Get-Location)+'\CodeSignCertificate.pfx')" >> $env:GITHUB_ENV
       - name: Prepare ccache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .ccache
           key: ${{ runner.os }}-msbuild-${{ github.ref }}-${{ github.sha }}-RELEASEPKG

From 5d80c9bbf5333fe611df54242ee0749713e4e03f Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Mon, 22 Jan 2024 14:32:07 +0000
Subject: [PATCH 2/2] GitHub cache action: use new save-always flag

PRs may (initially) see test failures, but subsequent builds should
still benefit from the incrementally constructed (c)cache. This is newly
available with version 4 of the cache action.
---
 .github/workflows/bsd.yaml                       |  3 +++
 .github/workflows/build-and-test-Linux.yaml      |  1 +
 .github/workflows/build-and-test-Xen.yaml        |  1 +
 .github/workflows/csmith.yaml                    |  1 +
 .../workflows/pull-request-check-rust-api.yaml   |  2 ++
 .github/workflows/pull-request-checks.yaml       | 16 ++++++++++++++++
 .github/workflows/release-packages.yaml          |  3 +++
 7 files changed, 27 insertions(+)

diff --git a/.github/workflows/bsd.yaml b/.github/workflows/bsd.yaml
index 7ec7b16af8d..4db8dda90f3 100644
--- a/.github/workflows/bsd.yaml
+++ b/.github/workflows/bsd.yaml
@@ -16,6 +16,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: freebsd-13.2-gmake-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -77,6 +78,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: openbsd-7.4-gmake-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -138,6 +140,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: netbsd-9.3-gmake-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
diff --git a/.github/workflows/build-and-test-Linux.yaml b/.github/workflows/build-and-test-Linux.yaml
index 35dc263d1d1..30779b0e835 100644
--- a/.github/workflows/build-and-test-Linux.yaml
+++ b/.github/workflows/build-and-test-Linux.yaml
@@ -27,6 +27,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-20.04-make-clang-${{ github.ref }}-${{ github.sha }}-KERNEL
           restore-keys: |
diff --git a/.github/workflows/build-and-test-Xen.yaml b/.github/workflows/build-and-test-Xen.yaml
index b80a59c43db..8102fc66ca4 100644
--- a/.github/workflows/build-and-test-Xen.yaml
+++ b/.github/workflows/build-and-test-Xen.yaml
@@ -26,6 +26,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-20.04-make-clang-${{ github.ref }}-${{ github.sha }}-XEN
           restore-keys: |
diff --git a/.github/workflows/csmith.yaml b/.github/workflows/csmith.yaml
index 2dbeca8306c..40e8b9f7b91 100644
--- a/.github/workflows/csmith.yaml
+++ b/.github/workflows/csmith.yaml
@@ -25,6 +25,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-20.04-make-clang-${{ github.ref }}-${{ github.sha }}-CSMITH
           restore-keys: |
diff --git a/.github/workflows/pull-request-check-rust-api.yaml b/.github/workflows/pull-request-check-rust-api.yaml
index 3522248b99e..bb486a13933 100644
--- a/.github/workflows/pull-request-check-rust-api.yaml
+++ b/.github/workflows/pull-request-check-rust-api.yaml
@@ -35,6 +35,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-22.04-cmake-clang-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -81,6 +82,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-Release-Minisat-${{ github.ref }}-${{ github.sha }}-PR-Rust-API
           restore-keys: |
diff --git a/.github/workflows/pull-request-checks.yaml b/.github/workflows/pull-request-checks.yaml
index 88e9cafadcf..a09bf84b422 100644
--- a/.github/workflows/pull-request-checks.yaml
+++ b/.github/workflows/pull-request-checks.yaml
@@ -34,6 +34,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-20.04-make-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -119,6 +120,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-20.04-make-clang-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -183,6 +185,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-20.04-make-clang-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -227,6 +230,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-20.04-Release-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -298,6 +302,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-22.04-make-clang-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -363,6 +368,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-22.04-Release-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -422,6 +428,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-22.04-Release-gcc-13-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -468,6 +475,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-22.04-Release-32-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -506,6 +514,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-20.04-Release-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -552,6 +561,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-20.04-Release-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -592,6 +602,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-make-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -643,6 +654,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-Release-Glucose-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -700,6 +712,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-msbuild-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -758,6 +771,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-msbuild-make-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
@@ -813,6 +827,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-msbuild-${{ github.ref }}-${{ github.sha }}-PKG
           restore-keys: |
@@ -930,6 +945,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-20.04-Coverage-${{ github.ref }}-${{ github.sha }}-PR
           restore-keys: |
diff --git a/.github/workflows/release-packages.yaml b/.github/workflows/release-packages.yaml
index 5ac5ce434de..dcf307df97f 100644
--- a/.github/workflows/release-packages.yaml
+++ b/.github/workflows/release-packages.yaml
@@ -29,6 +29,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-22.04-Release-${{ github.ref }}-${{ github.sha }}-RELEASEPKG
           restore-keys:
@@ -99,6 +100,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-20.04-Release-${{ github.ref }}-${{ github.sha }}-RELEASEPKG
           restore-keys: |
@@ -201,6 +203,7 @@ jobs:
       - name: Prepare ccache
         uses: actions/cache@v4
         with:
+          save-always: true
           path: .ccache
           key: ${{ runner.os }}-msbuild-${{ github.ref }}-${{ github.sha }}-RELEASEPKG
           restore-keys: |