fix spack-packages commit

Author: haampie

.github/workflows/clingo.yml

@@ -47,6 +47,11 @@ jobs:
           repository: spack/spack
           path: spack
           ref: 734c5db2121b01c373eed6538e452f18887e9e44
+      - uses: actions/checkout@v4
+        with:
+          repository: spack/spack-packages
+          path: spack-packages
+          ref: a5b98e6b7e411a499f310e048c1d2e39d1004519
       # See https://github.com/actions/setup-python/issues/960
       - name: Workaround for broken Python versions from setup-python
         run: brew install gettext zlib
@@ -60,6 +65,7 @@ jobs:
           . spack/share/spack/setup-env.sh
 
           spack config add "config:install_tree:padded_length:256"
+          spack repo set --destination "$PWD/spack-packages" builtin
 
           spack python clingo/install_clingo.py
           spack buildcache push --unsigned ./binary-mirror clingo-bootstrap
@@ -88,13 +94,10 @@ jobs:
 
       - uses: docker/setup-buildx-action@v3
 
-      - name: set base image
-        run: |
-          if [ '${{ matrix.python-version }}' = '3.14' ]; then
-            echo "BASE_IMAGE=quay.io/pypa/manylinux2014:2025.11.11-1" >> $GITHUB_ENV
-          else
-            echo "BASE_IMAGE=ghcr.io/spack/manylinux2014:v2024-10-16" >> $GITHUB_ENV
-          fi
+      - if: ${{ matrix.python-version == '3.14' }}
+        run: echo "BASE_IMAGE=quay.io/pypa/manylinux2014:2025.11.11-1" >> $GITHUB_ENV
+      - if: ${{ matrix.python-version != '3.14' }}
+        run: echo "BASE_IMAGE=ghcr.io/spack/manylinux2014:v2024-10-16" >> $GITHUB_ENV
 
       - uses: docker/build-push-action@v5
         with:
@@ -127,10 +130,18 @@ jobs:
           repository: spack/spack
           path: spack
           ref: 734c5db2121b01c373eed6538e452f18887e9e44
+      - uses: actions/checkout@v4
+        with:
+          repository: spack/spack-packages
+          path: spack-packages
+          ref: a5b98e6b7e411a499f310e048c1d2e39d1004519
 
       - uses: actions/download-artifact@v6
 
-      - run: ./spack/bin/spack python ./generate_bootstrap_json.py clingo
+      - run: |
+          . spack/share/spack/setup-env.sh
+          spack repo set --destination "$PWD/spack-packages" builtin
+          spack python ./generate_bootstrap_json.py clingo
 
       - uses: actions/upload-artifact@v5
         with:

.github/workflows/gnupg.yml

@@ -47,7 +47,7 @@ jobs:
         with:
           repository: spack/spack-packages
           path: spack-packages
-          ref: 4b8bb3514838ce9e8bbc2ca7f98e62dbd7100c63
+          ref: a5b98e6b7e411a499f310e048c1d2e39d1004519
       - name: Install gnupg
         run: |
           brew install gawk perl
@@ -58,7 +58,7 @@ jobs:
           git -C spack-packages apply "$PWD/gnupg/patches/gnupg_macos.patch"
 
           . spack/share/spack/setup-env.sh
-          spack repo set --destination spack/var/spack/repos/builtin builtin
+          spack repo set --destination "$PWD/spack-packages" builtin
 
           rm -rf $(spack location -p podman)
 
@@ -113,9 +113,17 @@ jobs:
           repository: spack/spack
           path: spack
           ref: 734c5db2121b01c373eed6538e452f18887e9e44
+      - uses: actions/checkout@v4
+        with:
+          repository: spack/spack-packages
+          path: spack-packages
+          ref: a5b98e6b7e411a499f310e048c1d2e39d1004519
       - uses: actions/download-artifact@v6
 
-      - run: ./spack/bin/spack python ./generate_bootstrap_json.py gnupg
+      - run: |
+          . spack/share/spack/setup-env.sh
+          spack repo set --destination "$PWD/spack-packages" builtin
+          spack python ./generate_bootstrap_json.py gnupg
 
       - uses: actions/upload-artifact@v5
         with:

.github/workflows/patchelf.yml

@@ -61,9 +61,17 @@ jobs:
           repository: spack/spack
           path: spack
           ref: 734c5db2121b01c373eed6538e452f18887e9e44
+      - uses: actions/checkout@v4
+        with:
+          repository: spack/spack-packages
+          path: spack-packages
+          ref: a5b98e6b7e411a499f310e048c1d2e39d1004519
       - uses: actions/download-artifact@v6
 
-      - run: ./spack/bin/spack python ./generate_bootstrap_json.py patchelf
+      - run: |
+          . spack/share/spack/setup-env.sh
+          spack repo set --destination "$PWD/spack-packages" builtin
+          spack python ./generate_bootstrap_json.py patchelf
 
       - uses: actions/upload-artifact@v5
         with:

clingo/Dockerfile.manylinux2014

@@ -2,8 +2,6 @@ ARG BASE_IMAGE=ghcr.io/spack/manylinux2014:v2024-10-16
 FROM ${BASE_IMAGE}
 
 ARG PYTHON_VERSION
-ARG GITHUB_ACTOR
-ARG GITHUB_TOKEN
 
 RUN tar -C /opt/_internal -xvf /opt/_internal/static-libs-for-embedding-only.tar.xz
 
@@ -21,7 +19,13 @@ RUN mkdir /root/spack && \
     git fetch --depth=1 https://github.com/spack/spack.git 734c5db2121b01c373eed6538e452f18887e9e44:docker-reference && \
     git checkout docker-reference
 
-# Set externals, locate compilers
+RUN mkdir /root/spack-packages && \
+    cd /root/spack-packages && \
+    git init . && \
+    git fetch --depth=1 https://github.com/spack/spack-packages.git a5b98e6b7e411a499f310e048c1d2e39d1004519:docker-reference && \
+    git checkout docker-reference
+
+RUN spack repo set --destination /root/spack-packages builtin
 RUN spack external find bison cmake
 RUN spack compiler find
 RUN spack config add "config:install_tree:padded_length:256"

gnupg/Dockerfile.manylinux2014

@@ -14,7 +14,13 @@ RUN mkdir /root/spack && \
     git fetch --depth=1 https://github.com/spack/spack.git 734c5db2121b01c373eed6538e452f18887e9e44:docker-reference && \
     git checkout docker-reference
 
-# Set externals, locate compilers
+RUN mkdir /root/spack-packages && \
+    cd /root/spack-packages && \
+    git init . && \
+    git fetch --depth=1 https://github.com/spack/spack-packages.git a5b98e6b7e411a499f310e048c1d2e39d1004519:docker-reference && \
+    git checkout docker-reference
+
+RUN spack repo set --destination /root/spack-packages builtin
 RUN spack external find --not-buildable gawk perl
 RUN spack compiler find
 RUN spack config add "config:install_tree:padded_length:256"

patchelf/Dockerfile.manylinux2014

@@ -14,6 +14,13 @@ RUN mkdir /root/spack && \
     git fetch --depth=1 https://github.com/spack/spack.git 734c5db2121b01c373eed6538e452f18887e9e44:docker-reference && \
     git checkout docker-reference
 
+RUN mkdir /root/spack-packages && \
+    cd /root/spack-packages && \
+    git init . && \
+    git fetch --depth=1 https://github.com/spack/spack-packages.git a5b98e6b7e411a499f310e048c1d2e39d1004519:docker-reference && \
+    git checkout docker-reference
+
+RUN spack repo set --destination /root/spack-packages builtin
 RUN spack compiler find
 RUN spack config add "config:install_tree:padded_length:256"