dep-image-*.yml: Added spack-config-version input, workflow now uses …

…compiler-package-version
ACCESS-NRI · Jun 5, 2024 · 26c48ad · 26c48ad
1 parent 5f9e3cf
commit 26c48ad
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/.github/workflows/dep-image-1-start.yml b/.github/workflows/dep-image-1-start.yml
@@ -7,7 +7,12 @@ on:
         required: true
         type: string
         default: "main"
-        description: "Either a git tag or branch name for the ACCESS-NRI/spack-packages repository, which defaults to the main branch"
+        description: "Either a git tag or branch name for the ACCESS-NRI/spack-packages repository"
+      spack-config-version:
+        required: true
+        type: string
+        default: "main"
+        description: "Either a git tag or branch name for the ACCESS-NRI/spack-config repository"
       model:
         required: true
         type: string
@@ -52,8 +57,10 @@ jobs:
     with:
       compiler-name: ${{ matrix.compiler.name }}
       compiler-package: ${{ matrix.compiler.package }}
+      compiler-package-version: ${{ matrix.compiler.package-version }}
       compiler-version: ${{ matrix.compiler.version }}
       spack-packages-version: ${{ inputs.spack-packages-version }}
+      spack-config-version: ${{ inputs.spack-config-version }}
       models: ${{ needs.generate-matrix.outputs.models }}
     permissions:
       packages: write

diff --git a/.github/workflows/dep-image-2-build.yml b/.github/workflows/dep-image-2-build.yml
@@ -5,14 +5,20 @@ on:
       spack-packages-version:
         description: the tag/branch of the access-nri/spack-packages repo to use
         type: string
+      spack-config-version:
+        description: the tag/branch of the access-nri/spack-config repo to use
+        type: string
       compiler-name:
         description: the short name of the compiler
         type: string
       compiler-package:
         description: the spack-specific package name of the compiler
         type: string
+      compiler-package-version:
+        description: the spack-specific version of the compiler package
+        type: string
       compiler-version:
-        description: the spack-specific package version of the compiler
+        description: the spack-specific version of the compiler
         type: string
       models:
         description: a json-string array of all models to be built in a matrix strategy
@@ -55,9 +61,11 @@ jobs:
           target: "ci"
           build-args: |
             SPACK_PACKAGES_REPO_VERSION=${{ inputs.spack-packages-version }}
+            SPACK_CONFIG_REPO_VERSION=${{ inputs.spack-config-version }}
             COMPILER_NAME=${{ inputs.compiler-name }}
-            COMPILER_PACKAGE=${{ inputs.compiler-package }}
             COMPILER_VERSION=${{ inputs.compiler-version }}
+            COMPILER_PKG_NAME=${{ inputs.compiler-package }}
+            COMPILER_PKG_VERSION=${{ inputs.compiler-package-version }}
           build-secrets: |
             S3_ACCESS_KEY_ID=${{ secrets.S3_ACCESS_KEY_ID }}
             S3_ACCESS_KEY_SECRET=${{ secrets.S3_ACCESS_KEY_SECRET }}