From be00509b1486826e17c17ecb7d3a1ad7bfd5fc83 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Mon, 9 Sep 2024 09:29:35 -0400 Subject: [PATCH 1/2] CI: Upgrade checkout, cache actions to v4 --- .github/workflows/crucible-go-build.yml | 6 +++--- .github/workflows/crucible-jvm-build.yml | 6 +++--- .github/workflows/crucible-wasm-build.yml | 6 +++--- .github/workflows/crux-llvm-build.yml | 6 +++--- .github/workflows/crux-mir-build.yml | 6 +++--- .github/workflows/lint.yml | 2 +- .github/workflows/uc-crux-llvm-lint.yaml | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/crucible-go-build.yml b/.github/workflows/crucible-go-build.yml index f20c0d205..43e864d80 100644 --- a/.github/workflows/crucible-go-build.yml +++ b/.github/workflows/crucible-go-build.yml @@ -38,7 +38,7 @@ jobs: ghc: 9.8.2 name: crucible-go - GHC v${{ matrix.ghc }} - ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: true @@ -65,7 +65,7 @@ jobs: extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - - uses: actions/cache/restore@v3 + - uses: actions/cache/restore@v4 name: Restore cabal store cache with: path: | @@ -122,7 +122,7 @@ jobs: shell: bash run: cabal v2-haddock crucible-go - - uses: actions/cache/save@v3 + - uses: actions/cache/save@v4 name: Save cabal store cache if: always() with: diff --git a/.github/workflows/crucible-jvm-build.yml b/.github/workflows/crucible-jvm-build.yml index 22333dfac..dd3e4f671 100644 --- a/.github/workflows/crucible-jvm-build.yml +++ b/.github/workflows/crucible-jvm-build.yml @@ -38,7 +38,7 @@ jobs: ghc: 9.8.2 name: crucible-jvm - GHC v${{ matrix.ghc }} - ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: true @@ -65,7 +65,7 @@ jobs: extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - - uses: actions/cache/restore@v3 + - uses: actions/cache/restore@v4 name: Restore cabal store cache with: path: | @@ -122,7 +122,7 @@ jobs: shell: bash run: cabal v2-haddock crucible-jvm - - uses: actions/cache/save@v3 + - uses: actions/cache/save@v4 name: Save cabal store cache if: always() with: diff --git a/.github/workflows/crucible-wasm-build.yml b/.github/workflows/crucible-wasm-build.yml index ffe166d62..bcd33d1bc 100644 --- a/.github/workflows/crucible-wasm-build.yml +++ b/.github/workflows/crucible-wasm-build.yml @@ -38,7 +38,7 @@ jobs: ghc: 9.8.2 name: crucible-wasm - GHC v${{ matrix.ghc }} - ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: true @@ -65,7 +65,7 @@ jobs: extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - - uses: actions/cache/restore@v3 + - uses: actions/cache/restore@v4 name: Restore cabal store cache with: path: | @@ -125,7 +125,7 @@ jobs: shell: bash run: cabal v2-haddock crucible-wasm - - uses: actions/cache/save@v3 + - uses: actions/cache/save@v4 name: Save cabal store cache if: always() with: diff --git a/.github/workflows/crux-llvm-build.yml b/.github/workflows/crux-llvm-build.yml index f949208a2..d66b90059 100644 --- a/.github/workflows/crux-llvm-build.yml +++ b/.github/workflows/crux-llvm-build.yml @@ -78,7 +78,7 @@ jobs: ghc: 9.4.8 name: crux-llvm - GHC v${{ matrix.ghc }} - ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: true @@ -105,7 +105,7 @@ jobs: extra_nix_config: | access-tokens = github.com=${{ secrets.GITHUB_TOKEN }} - - uses: actions/cache/restore@v3 + - uses: actions/cache/restore@v4 name: Restore cabal store cache with: path: | @@ -248,7 +248,7 @@ jobs: path: crux-llvm-*.tar.gz* name: crux-llvm-${{ matrix.os }}-${{ matrix.ghc }} - - uses: actions/cache/save@v3 + - uses: actions/cache/save@v4 name: Save cabal store cache if: always() with: diff --git a/.github/workflows/crux-mir-build.yml b/.github/workflows/crux-mir-build.yml index 8bf7a68c3..6356215d1 100644 --- a/.github/workflows/crux-mir-build.yml +++ b/.github/workflows/crux-mir-build.yml @@ -77,7 +77,7 @@ jobs: # We want Windows soon, but it doesn't need to be now name: crux-mir - GHC v${{ matrix.ghc }} - ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: true @@ -111,7 +111,7 @@ jobs: override: true components: rustc-dev - - uses: actions/cache/restore@v3 + - uses: actions/cache/restore@v4 name: Restore cabal store cache with: path: | @@ -210,7 +210,7 @@ jobs: path: crux-mir-*.tar.gz* name: crux-mir-${{ matrix.os }}-${{ matrix.ghc }} - - uses: actions/cache/save@v3 + - uses: actions/cache/save@v4 name: Save cabal store cache if: always() with: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7396dc3e6..c477f4f0d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-22.04 name: lint steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: false diff --git a/.github/workflows/uc-crux-llvm-lint.yaml b/.github/workflows/uc-crux-llvm-lint.yaml index 6e8e4cae4..8eb482ee1 100644 --- a/.github/workflows/uc-crux-llvm-lint.yaml +++ b/.github/workflows/uc-crux-llvm-lint.yaml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-20.04 name: uc-crux-llvm lint steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: false From 99905391f648695daf4ba1f5b460caa5be7aad8c Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Mon, 9 Sep 2024 09:30:28 -0400 Subject: [PATCH 2/2] CI: Upgrade upload-artifact action to v4 Fixes #1250. --- .github/workflows/crux-llvm-build.yml | 2 +- .github/workflows/crux-mir-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/crux-llvm-build.yml b/.github/workflows/crux-llvm-build.yml index d66b90059..bc0440602 100644 --- a/.github/workflows/crux-llvm-build.yml +++ b/.github/workflows/crux-llvm-build.yml @@ -242,7 +242,7 @@ jobs: run: | .github/ci.sh sign "${NAME}.tar.gz" - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: github.repository == 'GaloisInc/crucible' with: path: crux-llvm-*.tar.gz* diff --git a/.github/workflows/crux-mir-build.yml b/.github/workflows/crux-mir-build.yml index 6356215d1..6272c22b7 100644 --- a/.github/workflows/crux-mir-build.yml +++ b/.github/workflows/crux-mir-build.yml @@ -204,7 +204,7 @@ jobs: run: | .github/ci.sh sign "${NAME}.tar.gz" - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: github.repository == 'GaloisInc/crucible' with: path: crux-mir-*.tar.gz*