...

pdidev · May 27, 2024 · 68259fa · 68259fa
1 parent dca9ea4
commit 68259fa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/debuntu_docker_images.yml b/.github/workflows/debuntu_docker_images.yml
@@ -32,7 +32,7 @@ jobs:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: debuntu/${{ matrix.variant }}
         image-name: ${{ matrix.base }}/${{ matrix.mpi }}/${{ matrix.variant }}
-        test: false # should be true, except for "all" variant
+        test: '${{ matrix.variant != "pdi" }}' # should be true, except for "pdi" variant
         build-args: |
           MPI=${{ matrix.mpi }}
           DISTRO=${{ steps.info.outputs.distro }}

diff --git a/.github/workflows/spack_docker_images.yml b/.github/workflows/spack_docker_images.yml
@@ -11,14 +11,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Build and push 1a-base"
-      uses: pdidev/test_env/.github/actions/build@v3
+      uses: pdidev/test_env/.github/actions/build@vdeps
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/1a-base
         image-name: base
         cache: ${{ github.event_name != 'schedule' }}
     - name: "Build and push 1b-spackbase"
-      uses: pdidev/test_env/.github/actions/build@v3
+      uses: pdidev/test_env/.github/actions/build@vdeps
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/1b-spackbase
@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Build and push 2a-precomp"
-      uses: pdidev/test_env/.github/actions/build@v3
+      uses: pdidev/test_env/.github/actions/build@vdeps
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/2a-precomp
@@ -42,7 +42,7 @@ jobs:
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
     - name: "Build and push 2b-compiler"
-      uses: pdidev/test_env/.github/actions/build@v3
+      uses: pdidev/test_env/.github/actions/build@vdeps
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/2b-compiler
@@ -51,7 +51,7 @@ jobs:
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
     - name: "Build and push 2c-squash"
-      uses: pdidev/test_env/.github/actions/build@v3
+      uses: pdidev/test_env/.github/actions/build@vdeps
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/2c-squash
@@ -69,7 +69,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Build and push 3a-precomp"
-      uses: pdidev/test_env/.github/actions/build@v3
+      uses: pdidev/test_env/.github/actions/build@vdeps
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/3a-precomp
@@ -78,7 +78,7 @@ jobs:
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
     - name: "Build and push 3b-compiler"
-      uses: pdidev/test_env/.github/actions/build@v3
+      uses: pdidev/test_env/.github/actions/build@vdeps
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/3b-compiler
@@ -87,7 +87,7 @@ jobs:
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
     - name: "Build and push 3c-squash"
-      uses: pdidev/test_env/.github/actions/build@v3
+      uses: pdidev/test_env/.github/actions/build@vdeps
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/3c-squash
@@ -96,7 +96,7 @@ jobs:
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
     - name: "Build and push 4a-baselibs"
-      uses: pdidev/test_env/.github/actions/build@v3
+      uses: pdidev/test_env/.github/actions/build@vdeps
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/4a-baselibs
@@ -105,7 +105,7 @@ jobs:
           VERSION=${{ matrix.version }}
           COMPILER=${{ matrix.compiler }}
     - name: "Build and push 4b-squash"
-      uses: pdidev/test_env/.github/actions/build@v3
+      uses: pdidev/test_env/.github/actions/build@vdeps
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/4b-squash
@@ -124,7 +124,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Build and push 5a-mpi"
-      uses: pdidev/test_env/.github/actions/build@v3
+      uses: pdidev/test_env/.github/actions/build@vdeps
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/5a-mpi
@@ -134,7 +134,7 @@ jobs:
           COMPILER=${{ matrix.compiler }}
           MPI=${{ matrix.mpi }}
     - name: "Build and push spack/5b-squash"
-      uses: pdidev/test_env/.github/actions/build@v3
+      uses: pdidev/test_env/.github/actions/build@vdeps
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/5b-squash
@@ -144,7 +144,7 @@ jobs:
           COMPILER=${{ matrix.compiler }}
           MPI=${{ matrix.mpi }}
     - name: "Build and push 6-optlibs"
-      uses: pdidev/test_env/.github/actions/build@v3
+      uses: pdidev/test_env/.github/actions/build@vdeps
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/6-optlibs
@@ -172,7 +172,7 @@ jobs:
           echo "tags=ghcr.io/pdidev/spack/${{ matrix.version }}/${{ matrix.compiler }}/${{ matrix.mpi }}/${{ matrix.level }}:${{github.ref_name}}" >> "${GITHUB_OUTPUT}"
         fi
     - name: "Build and push"
-      uses: pdidev/test_env/.github/actions/build@v3
+      uses: pdidev/test_env/.github/actions/build@vdeps
       with:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         path: spack/7-finalize