Set the spack-version explicitly when @git.<gitref> is used

harshula · harshula · commit d18ea21c29ef · 2025-02-03T12:51:52.000+11:00
* Spack upstream is planning to insert a spack-version when one is
  not explicitly provided.
* The error we saw when using `spack config change` can be avoided
  when a spack-version is explicitly provided.
* The latest spack-packages repository contains changes that this
  change requires.
diff --git a/config/versions.json b/config/versions.json
@@ -1,5 +1,5 @@
 {
     "$schema": "https://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json",
     "spack": "0.22",
-    "spack-packages": "2024.03.22"
+    "spack-packages": "2025.01.1"
 }
diff --git a/spack.yaml b/spack.yaml
@@ -5,20 +5,22 @@
 spack:
   # add package specs to the `specs` list
   specs:
-    - access-om2@git.2024.03.0
+    # TODO: The CI/CD doesn't support the `=access-om2` syntax yet.
+    # - access-om2@git.2024.03.0=access-om2
+    - access-om2@git.2024.03.1
   packages:
     cice5:
       require:
-        - '@git.2023.10.19'
+        - '@git.2023.10.19=access-om2'
     mom5:
       require:
-        - '@git.2023.11.09'
+        - '@git.2023.11.09=access-om2'
     libaccessom2:
       require:
-        - '@git.2023.10.26'
+        - '@git.2023.10.26=access-om2'
     oasis3-mct:
       require:
-        - '@git.2023.11.09'
+        - '@git.2023.11.09=access-om2'
     netcdf-c:
       require:
         - '@4.7.4'
@@ -48,7 +50,7 @@ spack:
           - libaccessom2
           - oasis3-mct
         projections:
-          access-om2: '{name}/2024.03.0'
+          access-om2: '{name}/2024.03.1'
           cice5: '{name}/2023.10.19-{hash:7}'
           mom5: '{name}/2023.11.09-{hash:7}'
           libaccessom2: '{name}/2023.10.26-{hash:7}'

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json",`
`3`	`3`	`"spack": "0.22",`
`4`		`- "spack-packages": "2024.03.22"`
	`4`	`+ "spack-packages": "2025.01.1"`
`5`	`5`	`}`