Dockerfile additions to workflow (#162)

* compilers.*: Added package-version field to data and schema

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

* model-1-build.yml: Now uses spack-enable.bash instead of default setup-env.sh

* Moved compilers.json fields in line with Dockerfile.base-spack ARGs

* Updated variable names

* Using 2021.2.0 compiler version

Author: CodeGat

.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
@@ -50,10 +55,12 @@ jobs:
         compiler: ${{ fromJson(needs.generate-matrix.outputs.compilers) }}
     uses: access-nri/build-ci/.github/workflows/dep-image-2-build.yml@main
     with:
-      compiler-name: ${{ matrix.compiler.name }}
-      compiler-package: ${{ matrix.compiler.package }}
-      compiler-version: ${{ matrix.compiler.version }}
+      compiler-name: ${{ matrix.compiler.COMPILER_NAME }}
+      compiler-version: ${{ matrix.compiler.COMPILER_VERSION }}
+      compiler-pkg-name: ${{ matrix.compiler.COMPILER_PKG_NAME }}
+      compiler-pkg-version: ${{ matrix.compiler.COMPILER_PKG_VERSION }}
       spack-packages-version: ${{ inputs.spack-packages-version }}
+      spack-config-version: ${{ inputs.spack-config-version }}
       models: ${{ needs.generate-matrix.outputs.models }}
     permissions:
       packages: write

.github/workflows/dep-image-2-build.yml

@@ -5,15 +5,22 @@ 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:
+      compiler-version:
+        description: the spack-specific version of the compiler
+        type: string
+      compiler-pkg-name:
         description: the spack-specific package name of the compiler
         type: string
-      compiler-version:
-        description: the spack-specific package version of the compiler
+      compiler-pkg-version:
+        description: the spack-specific version of the compiler package
         type: string
+
       models:
         description: a json-string array of all models to be built in a matrix strategy
         type: string
@@ -55,9 +62,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-pkg-name }}
+            COMPILER_PKG_VERSION=${{ inputs.compiler-pkg-version }}
           build-secrets: |
             S3_ACCESS_KEY_ID=${{ secrets.S3_ACCESS_KEY_ID }}
             S3_ACCESS_KEY_SECRET=${{ secrets.S3_ACCESS_KEY_SECRET }}

.github/workflows/model-1-build.yml

@@ -102,7 +102,7 @@ jobs:
 
     - name: Build ${{ env.PACKAGE_NAME }} via spack
       run: |
-        . $SPACK_ROOT/share/spack/setup-env.sh
+        . $SPACK_ROOT/../spack-config/spack-enable.bash
         spack load ${{ matrix.compiler.package }}@${{ matrix.compiler.version }}
         spack compiler find
         spack env activate ${{ env.PACKAGE_NAME }}

config/compilers.json

@@ -1,7 +1,8 @@
 [
   {
-    "name": "intel",
-    "package": "intel-oneapi-compilers",
-    "version": "2021.4.0"
+    "COMPILER_NAME": "intel",
+    "COMPILER_VERSION": "2021.2.0",
+    "COMPILER_PKG_NAME": "intel-oneapi-compilers",
+    "COMPILER_PKG_VERSION": "2021.2.0"
   }
 ]

config/compilers.schema.json

@@ -6,17 +6,20 @@
     "items": {
         "type": "object",
         "properties": {
-            "name": {
+            "COMPILER_NAME": {
                 "type": "string"
             },
-            "package": {
+            "COMPILER_VERSION": {
                 "type": "string"
             },
-            "version": {
+            "COMPILER_PKG_NAME": {
+                "type": "string"
+            },
+            "COMPILER_PKG_VERSION": {
                 "type": "string"
             }
         },
-        "required": [ "name", "package", "version" ],
+        "required": [ "COMPILER_NAME", "COMPILER_VERSION", "COMPILER_PKG_NAME", "COMPILER_PKG_VERSION" ],
         "additionalProperties": false
     }
 }