From fcf8c918a8fcc9b48f1bb3347609ea3b4fb20946 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Thu, 19 Dec 2024 21:48:24 +0100 Subject: [PATCH] remove support for spack 0.21 (#15) --- .github/workflows/dev.yml | 14 ++------------ README.md | 11 +---------- action.yml | 6 ++---- 3 files changed, 5 insertions(+), 26 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 37e75f4..fad0521 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -12,7 +12,7 @@ jobs: matrix: ref: - develop - - releases/v0.21 + - releases/v0.23 steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 @@ -29,23 +29,13 @@ jobs: - name: Check build cache config run: spack config blame mirrors - - name: Check build cache install in active env with spack-bash shell (new style) + - name: Check build cache install in active env with spack-bash shell shell: spack-bash {0} run: | spack env activate spack install --add --cache-only --reuse python which python3 python3 -c 'print("hello world")' - if: matrix.ref == 'develop' - - - name: Check build cache install in active env with spack-bash shell (old style) - shell: spack-bash {0} - run: | - spack env activate - spack install --add --cache-only --reuse --no-check-signature python - which python3 - python3 -c 'print("hello world")' - if: matrix.ref == 'releases/v0.21' - name: Check spack-sh shell shell: spack-sh {0} diff --git a/README.md b/README.md index fea7ccc..4b04a83 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ jobs: - name: Set up Spack uses: spack/setup-spack@v2 with: - ref: develop # Spack version (examples: develop, releases/v0.21) + ref: develop # Spack version (examples: develop, releases/v0.23) buildcache: true # Configure oci://ghcr.io/spack/github-actions-buildcache color: true # Force color output (SPACK_COLOR=always) path: spack # Where to clone Spack @@ -23,15 +23,6 @@ jobs: When `buildcache: true` is set, binaries from https://github.com/spack/github-actions-buildcache are used. For available software, [see here](https://github.com/spack/github-actions-buildcache/blob/main/spack.yaml). -**Note**: when using the build cache with Spack v0.21 and below, the following flag is -required: - -``` -spack install --no-check-signature -``` - -This flag is no longer required in Spack v0.22. - ## Example: shell support If you want to use shell-aware commands such as `spack env activate` and `spack load`, diff --git a/action.yml b/action.yml index d689a09..037f866 100644 --- a/action.yml +++ b/action.yml @@ -6,7 +6,7 @@ branding: color: "blue" inputs: ref: - description: "Version of Spack (git ref: develop, releases/v0.21, ...)" + description: "Version of Spack (git ref: develop, releases/v0.23, ...)" required: false default: develop buildcache: @@ -41,9 +41,7 @@ runs: - name: Spack configuration run: | if [ ${{ inputs.buildcache }} = "true" ]; then - # Spack 0.22 should support the --unsigned flag - spack mirror add --unsigned github-actions-buildcache oci://ghcr.io/spack/github-actions-buildcache || \ - spack mirror add github-actions-buildcache oci://ghcr.io/spack/github-actions-buildcache + spack mirror add --unsigned github-actions-buildcache oci://ghcr.io/spack/github-actions-buildcache fi shell: sh