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

Author: CodeGat

.github/workflows/dep-image-1-start.yml

@@ -55,10 +55,10 @@ 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-package-version: ${{ matrix.compiler.package-version }}
-      compiler-version: ${{ matrix.compiler.version }}
+      compiler-name: ${{ matrix.compiler.COMPILER_NAME }}
+      compiler-package: ${{ matrix.compiler.COMPILER_PKG_NAME }}
+      compiler-package-version: ${{ matrix.compiler.COMPILER_PKG_VERSION }}
+      compiler-version: ${{ matrix.compiler.COMPILER_VERSION }}
       spack-packages-version: ${{ inputs.spack-packages-version }}
       spack-config-version: ${{ inputs.spack-config-version }}
       models: ${{ needs.generate-matrix.outputs.models }}

config/compilers.json

@@ -1,8 +1,8 @@
 [
   {
-    "name": "intel",
-    "package": "intel-oneapi-compilers-classic",
-    "package-version": "2021.6.0",
-    "version": "2021.10.0"
+    "COMPILER_NAME": "intel",
+    "COMPILER_VERSION": "2021.10.0",
+    "COMPILER_PKG_NAME": "intel-oneapi-compilers-classic",
+    "COMPILER_PKG_VERSION": "2021.6.0"
   }
 ]

config/compilers.schema.json

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