Fix unique paths for gnupg cache

Author: alecbcs

.github/workflows/gnupg.yml

@@ -69,64 +69,64 @@ jobs:
           spack buildcache push --unsigned ./binary-mirror gnupg
       - uses: actions/upload-artifact@v5
         with:
-          name: gnupg_binary_mirror
+          name: gnupg_binary_mirror-${{ matrix.runner[0] }}-${{ matrix.runner[1] }}-${{ matrix.python-version }}
           path: binary-mirror
 
-  manylinux2014:
-    runs-on: ["self-hosted", "Linux"]
-    outputs:
-      spack_manylinux_tag: ${{ fromJSON(steps.docker_meta.outputs.json).tags[0] }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      # Setup tags to be used for docker images
-      - uses: docker/metadata-action@v5
-        id: docker_meta
-        with:
-          images: ghcr.io/${{ github.repository_owner }}/gnupg_manylinux2014
-
-      # Login to Github Packages
-      - uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: docker/setup-qemu-action@v3
-        id: qemu
-        with:
-          platforms: linux/ppc64le,linux/arm64,linux/amd64
-
-      - uses: docker/setup-buildx-action@v3
-
-      # Build and eventually push to registry
-      - uses: docker/build-push-action@v5
-        with:
-          file: ./gnupg/Dockerfile.manylinux2014
-          platforms: linux/arm64,linux/ppc64le,linux/amd64
-          pull: ${{ github.event_name == 'pull_request' }}
-          cache-from: |
-            ghcr.io/${{ github.repository_owner }}/gnupg_manylinux2014:main
-            ${{ steps.docker_meta.outputs.tags }}
-          cache-to: type=inline
-          push: true
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
-
-  upload-manylinux2014:
-    runs-on: ubuntu-latest
-    needs: [ manylinux2014 ]
-    env:
-      SPACK_MANYLINUX2014_TAG: ${{ needs.manylinux2014.outputs.spack_manylinux_tag }}
-
-    steps:
-      - uses: actions/checkout@v4
-      - run: ./copy_mirror_manylinux2014.sh
-      - uses: actions/upload-artifact@v5
-        with:
-          name: gnupg_binary_mirror
-          path: binary-mirror
+  # manylinux2014:
+  #   runs-on: ["self-hosted", "Linux"]
+  #   outputs:
+  #     spack_manylinux_tag: ${{ fromJSON(steps.docker_meta.outputs.json).tags[0] }}
+
+  #   steps:
+  #     - uses: actions/checkout@v4
+
+  #     # Setup tags to be used for docker images
+  #     - uses: docker/metadata-action@v5
+  #       id: docker_meta
+  #       with:
+  #         images: ghcr.io/${{ github.repository_owner }}/gnupg_manylinux2014
+
+  #     # Login to Github Packages
+  #     - uses: docker/login-action@v3
+  #       with:
+  #         registry: ghcr.io
+  #         username: ${{ github.repository_owner }}
+  #         password: ${{ secrets.GITHUB_TOKEN }}
+
+  #     - uses: docker/setup-qemu-action@v3
+  #       id: qemu
+  #       with:
+  #         platforms: linux/ppc64le,linux/arm64,linux/amd64
+
+  #     - uses: docker/setup-buildx-action@v3
+
+  #     # Build and eventually push to registry
+  #     - uses: docker/build-push-action@v5
+  #       with:
+  #         file: ./gnupg/Dockerfile.manylinux2014
+  #         platforms: linux/arm64,linux/ppc64le,linux/amd64
+  #         pull: ${{ github.event_name == 'pull_request' }}
+  #         cache-from: |
+  #           ghcr.io/${{ github.repository_owner }}/gnupg_manylinux2014:main
+  #           ${{ steps.docker_meta.outputs.tags }}
+  #         cache-to: type=inline
+  #         push: true
+  #         tags: ${{ steps.docker_meta.outputs.tags }}
+  #         labels: ${{ steps.docker_meta.outputs.labels }}
+
+  # upload-manylinux2014:
+  #   runs-on: ubuntu-latest
+  #   needs: [ manylinux2014 ]
+  #   env:
+  #     SPACK_MANYLINUX2014_TAG: ${{ needs.manylinux2014.outputs.spack_manylinux_tag }}
+
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - run: ./copy_mirror_manylinux2014.sh
+  #     - uses: actions/upload-artifact@v5
+  #       with:
+  #         name: gnupg_binary_mirror
+  #         path: binary-mirror
 
   gnupg_json:
     runs-on: ubuntu-latest
@@ -139,8 +139,6 @@ jobs:
           path: spack
           ref: 734c5db2121b01c373eed6538e452f18887e9e44
       - uses: actions/download-artifact@v3
-        with:
-          name: gnupg_binary_mirror
       - run: ./spack/bin/spack python ./generate_bootstrap_json.py gnupg
       - uses: actions/upload-artifact@v5
         with:

generate_bootstrap_json.py

@@ -34,7 +34,7 @@ def run(pkg: str, deps=dt.NONE, python: bool = False):
     name = "clingo-bootstrap" if pkg == "clingo" else pkg
     shas = {
         tarball_hash(tarball): sha256(tarball)
-        for tarball in glob.glob("./clingo_binary_mirror*/**/*.spack", recursive=True)
+        for tarball in glob.glob(f"./{pkg}_binary_mirror*/**/*.spack", recursive=True)
     }
 
     specs = [