From 460ea1d70c78676ebd39f067b22a49a556ec1171 Mon Sep 17 00:00:00 2001 From: Nicholson Koukpaizan Date: Thu, 15 May 2025 13:49:49 -0400 Subject: [PATCH 1/3] Upgrade base image id to build a new cache. --- .github/workflows/spack_default_build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spack_default_build.yaml b/.github/workflows/spack_default_build.yaml index fcdb28c9..1e9e33fd 100644 --- a/.github/workflows/spack_default_build.yaml +++ b/.github/workflows/spack_default_build.yaml @@ -7,7 +7,7 @@ env: # Our repo name contains upper case characters, so we can't use ${{ github.repository }} IMAGE_NAME: gridkit USERNAME: gridkit-bot - BASE_VERSION: ubuntu-24.04-fortran-v0.2.11 + BASE_VERSION: ubuntu-24.04-fortran-v0.2.12 # Until we remove the need to clone submodules to build, this should on be in PRs on: [pull_request] From 69b7b403b1bc202e447709b5d7c365693b66c8f5 Mon Sep 17 00:00:00 2001 From: Nicholson Koukpaizan Date: Thu, 15 May 2025 13:55:35 -0400 Subject: [PATCH 2/3] Don't use corrupted local-buildcache. --- .github/workflows/spack_default_build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/spack_default_build.yaml b/.github/workflows/spack_default_build.yaml index 1e9e33fd..1727223d 100644 --- a/.github/workflows/spack_default_build.yaml +++ b/.github/workflows/spack_default_build.yaml @@ -161,7 +161,7 @@ jobs: run: spack -e . concretize - name: Install dependencies - run: spack -e . install --no-check-signature --only dependencies + run: spack -e . install --no-check-signature --no-cache --fresh --only dependencies - name: Install package run: spack -e . install --keep-stage --no-check-signature --no-cache --fresh From 6528c3db423bd9c904fb1b9412449f04563ae762 Mon Sep 17 00:00:00 2001 From: Nicholson Koukpaizan Date: Thu, 15 May 2025 13:57:08 -0400 Subject: [PATCH 3/3] Upgrade Spack. --- .github/workflows/spack_default_build.yaml | 4 ++-- buildsystem/spack/spack | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/spack_default_build.yaml b/.github/workflows/spack_default_build.yaml index 1727223d..72dbc9b5 100644 --- a/.github/workflows/spack_default_build.yaml +++ b/.github/workflows/spack_default_build.yaml @@ -7,7 +7,7 @@ env: # Our repo name contains upper case characters, so we can't use ${{ github.repository }} IMAGE_NAME: gridkit USERNAME: gridkit-bot - BASE_VERSION: ubuntu-24.04-fortran-v0.2.12 + BASE_VERSION: ubuntu-24.04-fortran-v0.2.13 # Until we remove the need to clone submodules to build, this should on be in PRs on: [pull_request] @@ -134,7 +134,7 @@ jobs: padded_length: 128 mirrors: local-buildcache: oci://${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - spack: https://binaries.spack.io/v0.23.1 + spack: https://binaries.spack.io/develop packages: llvm: externals: diff --git a/buildsystem/spack/spack b/buildsystem/spack/spack index 2452bf8b..5c7268c8 160000 --- a/buildsystem/spack/spack +++ b/buildsystem/spack/spack @@ -1 +1 @@ -Subproject commit 2452bf8bc7d1c8a80ae9214a037193867d48f77c +Subproject commit 5c7268c8b7cf6699ff07863a24b1cd51b8f34ad9