From 57c5e3481aa0052929f7779a942954d022cbccdf Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Tue, 18 Nov 2025 14:06:22 +1100
Subject: [PATCH 01/10] [no ci] infra: Update to v8

---
 .github/workflows/cd.yml | 4 ++--
 .github/workflows/ci.yml | 6 +++---
 config/versions.json     | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index c88109a..ba49ffe 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -63,14 +63,14 @@ jobs:
       max-parallel: 1
       matrix:
         manifest: ${{ fromJson(needs.setup-cd.outputs.manifest) }}
-    uses: access-nri/build-cd/.github/workflows/cd.yml@v7
+    uses: access-nri/build-cd/.github/workflows/cd.yml@v8
     with:
       model: ${{ matrix.manifest.name }}
       spack-manifest-path: ${{ matrix.manifest.path }}
       # We have a custom schema for general software deployment manifests, so we specify it here
       spack-manifest-schema-path: au.org.access-nri/tools/spack/environment/deployment
       spack-manifest-schema-version: 1-0-0
-      config-versions-schema-version: 3-0-0
+      config-versions-schema-version: 4-0-0
       config-packages-schema-version: 1-0-0
       # This is a non-model deployment repository, so we do not want to tag the deployment or upload to the build database
       tag-deployment: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 315ff4b..c2e43b8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -105,7 +105,7 @@ jobs:
       max-parallel: 1
       matrix:
         manifest: ${{ fromJson(needs.setup-pr.outputs.manifest) }}
-    uses: access-nri/build-cd/.github/workflows/ci.yml@v7
+    uses: access-nri/build-cd/.github/workflows/ci.yml@v8
     with:
       model: ${{ matrix.manifest.name }}
       pr: ${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.event.issue.number }}
@@ -113,7 +113,7 @@ jobs:
       # We have a custom schema for general software deployment manifests, so we specify it here
       spack-manifest-schema-path: au.org.access-nri/tools/spack/environment/deployment
       spack-manifest-schema-version: 1-0-0
-      config-versions-schema-version: 3-0-0
+      config-versions-schema-version: 4-0-0
       config-packages-schema-version: 1-0-0
     permissions:
       pull-requests: write
@@ -135,7 +135,7 @@ jobs:
       max-parallel: 1
       matrix:
         manifest: ${{ fromJson(needs.setup-pr.outputs.manifest) }}
-    uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v7
+    uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v8
     with:
       root-sbd: ${{ matrix.manifest.name }}
     secrets: inherit
diff --git a/config/versions.json b/config/versions.json
index c66cc11..7c22d7d 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json",
-    "spack": "0.22",
-    "spack-packages": "2025.09.004"
+  "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/4-0-0.json",
+  "spack": "1.0",
+  "access-spack-packages": "2025.09.004"
 }

From c88634481d195d1d7f73595a0db159f95ad0d0f0 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Fri, 5 Dec 2025 09:50:08 +1100
Subject: [PATCH 02/10] [no ci] infra: Update spack version to v1.1, update
 manifest schema to 2-0-0

---
 .github/workflows/cd.yml | 2 +-
 .github/workflows/ci.yml | 2 +-
 config/versions.json     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index ba49ffe..30bbebe 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -69,7 +69,7 @@ jobs:
       spack-manifest-path: ${{ matrix.manifest.path }}
       # We have a custom schema for general software deployment manifests, so we specify it here
       spack-manifest-schema-path: au.org.access-nri/tools/spack/environment/deployment
-      spack-manifest-schema-version: 1-0-0
+      spack-manifest-schema-version: 2-0-0
       config-versions-schema-version: 4-0-0
       config-packages-schema-version: 1-0-0
       # This is a non-model deployment repository, so we do not want to tag the deployment or upload to the build database
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c2e43b8..57ce734 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -112,7 +112,7 @@ jobs:
       spack-manifest-path: ${{ matrix.manifest.path }}
       # We have a custom schema for general software deployment manifests, so we specify it here
       spack-manifest-schema-path: au.org.access-nri/tools/spack/environment/deployment
-      spack-manifest-schema-version: 1-0-0
+      spack-manifest-schema-version: 2-0-0
       config-versions-schema-version: 4-0-0
       config-packages-schema-version: 1-0-0
     permissions:
diff --git a/config/versions.json b/config/versions.json
index 7c22d7d..5dc4cbd 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,5 +1,5 @@
 {
   "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/4-0-0.json",
-  "spack": "1.0",
+  "spack": "1.1",
   "access-spack-packages": "2025.09.004"
 }

From 6406b01c840310999705c7839da9b8964282b782 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Fri, 5 Dec 2025 16:21:34 +1100
Subject: [PATCH 03/10] [no ci] spack.yaml: Dedent list elements for
 spack-style manifests

---
 babeltrace2/spack.yaml       |  5 ++---
 esmf/spack.yaml              | 36 ++++++++++++++++++------------------
 fre-nctools/spack.yaml       | 10 +++++-----
 mppnccombine-fast/spack.yaml |  4 ++--
 4 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/babeltrace2/spack.yaml b/babeltrace2/spack.yaml
index 9bf8f3c..00ee590 100644
--- a/babeltrace2/spack.yaml
+++ b/babeltrace2/spack.yaml
@@ -4,7 +4,7 @@
 # configuration settings.
 spack:
   specs:
-    - babeltrace2@2.1.2
+  - babeltrace2@2.1.2
   packages:
     all:
       require:
@@ -16,7 +16,6 @@ spack:
     default:
       tcl:
         include:
-          - babeltrace2
+        - babeltrace2
         projections:
           babeltrace2: 'model-tools/{name}/2.1.2'
-  
\ No newline at end of file
diff --git a/esmf/spack.yaml b/esmf/spack.yaml
index c5ece1b..fc3eb84 100644
--- a/esmf/spack.yaml
+++ b/esmf/spack.yaml
@@ -4,36 +4,36 @@
 # configuration settings.
 spack:
   specs:
-    - esmf@git.v8.7.0
+  - esmf@git.v8.7.0
   packages:
     parallelio:
       require:
-        - '@2.6.2+pnetcdf'
+      - '@2.6.2+pnetcdf'
     netcdf-c:
       require:
-        - '@4.9.2 build_system=cmake build_type=RelWithDebInfo'
+      - '@4.9.2 build_system=cmake build_type=RelWithDebInfo'
     netcdf-fortran:
       require:
-        - '@4.6.1'
+      - '@4.6.1'
     fms:
       require:
-        - '@git.2024.03 precision=64 +large_file ~gfs_phys ~quad_precision ~openmp'
+      - '@git.2024.03 precision=64 +large_file ~gfs_phys ~quad_precision ~openmp'
     fortranxml:
       require:
-        - '@4.1.2'
+      - '@4.1.2'
     openmpi:
       require:
-        - '@4.1.7'
+      - '@4.1.7'
     gcc-runtime:
       require:
-        - '%gcc'
+      - '%gcc'
     libiconv:
       require:
-          - '%gcc'
+        - '%gcc'
     all:
       require:
-        - '%intel@2021.10.0'
-        - 'target=x86_64_v4'
+      - '%intel@2021.10.0'
+      - 'target=x86_64_v4'
   view: true
   concretizer:
     unify: true
@@ -41,11 +41,11 @@ spack:
     default:
       tcl:
         include:
-          - esmf
-          - parallelio
-          - netcdf-fortran
-          - netcdf-c
-          - fms
-          - fortranxml
+        - esmf
+        - parallelio
+        - netcdf-fortran
+        - netcdf-c
+        - fms
+        - fortranxml
         projections:
-          esmf: 'model-tools/{name}/v8.7.0'
\ No newline at end of file
+          esmf: 'model-tools/{name}/v8.7.0'
diff --git a/fre-nctools/spack.yaml b/fre-nctools/spack.yaml
index 5cc9642..2e5042f 100644
--- a/fre-nctools/spack.yaml
+++ b/fre-nctools/spack.yaml
@@ -4,17 +4,17 @@
 # configuration settings.
 spack:
   specs:
-    - fre-nctools@2024.05-1
+  - fre-nctools@2024.05-1
   packages:
     fre-nctools:
       require:
-        - '%intel@2021.10.0'
+      - '%intel@2021.10.0'
     netcdf-c:
       require:
-        - '@4.9.2'
+      - '@4.9.2'
     netcdf-fortran:
       require:
-        - '@4.6.1'
+      - '@4.6.1'
   view: true
   concretizer:
     unify: true
@@ -22,6 +22,6 @@ spack:
     default:
       tcl:
         include:
-          - fre-nctools
+        - fre-nctools
         projections:
           fre-nctools: 'model-tools/{name}/2024.05-1'
diff --git a/mppnccombine-fast/spack.yaml b/mppnccombine-fast/spack.yaml
index 6ca9f24..204f7ee 100644
--- a/mppnccombine-fast/spack.yaml
+++ b/mppnccombine-fast/spack.yaml
@@ -4,7 +4,7 @@
 # configuration settings.
 spack:
   specs:
-    - mppnccombine-fast@2025.07.000
+  - mppnccombine-fast@2025.07.000
   packages:
     netcdf-c:
       require:
@@ -25,6 +25,6 @@ spack:
     default:
       tcl:
         include:
-          - mppnccombine-fast
+        - mppnccombine-fast
         projections:
           mppnccombine-fast: 'model-tools/{name}/2025.07.000'

From 07f77c1bc0e5f57fe64f9cfc4f6507dffa38bc1d Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Fri, 5 Dec 2025 16:24:35 +1100
Subject: [PATCH 04/10] [no ci] spack.yaml: Add reserved definitions

---
 babeltrace2/spack.yaml       | 4 ++++
 esmf/spack.yaml              | 4 ++++
 fre-nctools/spack.yaml       | 4 ++++
 mppnccombine-fast/spack.yaml | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/babeltrace2/spack.yaml b/babeltrace2/spack.yaml
index 00ee590..48003a2 100644
--- a/babeltrace2/spack.yaml
+++ b/babeltrace2/spack.yaml
@@ -3,6 +3,10 @@
 # It describes a set of packages to be installed, along with
 # configuration settings.
 spack:
+  definitions:
+  # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise
+  - _name: [babeltrace2]
+  - _version: [2.1.2]
   specs:
   - babeltrace2@2.1.2
   packages:
diff --git a/esmf/spack.yaml b/esmf/spack.yaml
index fc3eb84..4afac3b 100644
--- a/esmf/spack.yaml
+++ b/esmf/spack.yaml
@@ -3,6 +3,10 @@
 # It describes a set of packages to be installed, along with
 # configuration settings.
 spack:
+  definitions:
+  # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise
+  - _name: [esmf]
+  - _version: [v8.7.0]
   specs:
   - esmf@git.v8.7.0
   packages:
diff --git a/fre-nctools/spack.yaml b/fre-nctools/spack.yaml
index 2e5042f..1adac28 100644
--- a/fre-nctools/spack.yaml
+++ b/fre-nctools/spack.yaml
@@ -3,6 +3,10 @@
 # It describes a set of packages to be installed, along with
 # configuration settings.
 spack:
+  definitions:
+  # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise
+  - _name: [fre-nctools]
+  - _version: [2024.05-1]
   specs:
   - fre-nctools@2024.05-1
   packages:
diff --git a/mppnccombine-fast/spack.yaml b/mppnccombine-fast/spack.yaml
index 204f7ee..36d1a94 100644
--- a/mppnccombine-fast/spack.yaml
+++ b/mppnccombine-fast/spack.yaml
@@ -3,6 +3,10 @@
 # It describes a set of packages to be installed, along with
 # configuration settings.
 spack:
+  definitions:
+  # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise
+  - _name: [mppnccombine-fast]
+  - _version: [2025.07.000]
   specs:
   - mppnccombine-fast@2025.07.000
   packages:

From 12a42f051012fa0d6370679ce7d81d4b92889282 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Fri, 5 Dec 2025 16:29:27 +1100
Subject: [PATCH 05/10] [no ci] spack.yaml: Use toolchains

---
 babeltrace2/spack.yaml       |  6 +++++-
 esmf/spack.yaml              | 11 ++++++++---
 fre-nctools/spack.yaml       |  7 ++++++-
 mppnccombine-fast/spack.yaml |  8 +++++++-
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/babeltrace2/spack.yaml b/babeltrace2/spack.yaml
index 48003a2..a8fa3c7 100644
--- a/babeltrace2/spack.yaml
+++ b/babeltrace2/spack.yaml
@@ -10,9 +10,13 @@ spack:
   specs:
   - babeltrace2@2.1.2
   packages:
+    intel-oneapi-compilers-classic:
+      require:
+      - '@2021.10.0'
+
     all:
       require:
-      - '%intel@2021.10.0'
+      - '%access_intel'
   view: true
   concretizer:
     unify: true
diff --git a/esmf/spack.yaml b/esmf/spack.yaml
index 4afac3b..6ec7e03 100644
--- a/esmf/spack.yaml
+++ b/esmf/spack.yaml
@@ -30,13 +30,18 @@ spack:
       - '@4.1.7'
     gcc-runtime:
       require:
-      - '%gcc'
+      - '%access_gcc'
     libiconv:
       require:
-        - '%gcc'
+      - '%access_gcc'
+    # Compilers
+    intel-oneapi-compilers-classic:
+      require:
+      - '@2021.10.0'
+
     all:
       require:
-      - '%intel@2021.10.0'
+      - '%access_intel'
       - 'target=x86_64_v4'
   view: true
   concretizer:
diff --git a/fre-nctools/spack.yaml b/fre-nctools/spack.yaml
index 1adac28..b02ec34 100644
--- a/fre-nctools/spack.yaml
+++ b/fre-nctools/spack.yaml
@@ -12,13 +12,18 @@ spack:
   packages:
     fre-nctools:
       require:
-      - '%intel@2021.10.0'
+      - '%access_intel'
     netcdf-c:
       require:
       - '@4.9.2'
     netcdf-fortran:
       require:
       - '@4.6.1'
+
+    # Compilers
+    intel-oneapi-compilers-classic:
+      require:
+      - '@2021.10.0'
   view: true
   concretizer:
     unify: true
diff --git a/mppnccombine-fast/spack.yaml b/mppnccombine-fast/spack.yaml
index 36d1a94..b009922 100644
--- a/mppnccombine-fast/spack.yaml
+++ b/mppnccombine-fast/spack.yaml
@@ -19,9 +19,15 @@ spack:
     openmpi:
       require:
       - '@5.0.5'
+
+    # Compilers
+    intel-oneapi-compilers-classic:
+      require:
+      - '@2021.10.0'
+
     all:
       require:
-      - '%intel@2021.10.0'
+      - '%access_intel'
   view: true
   concretizer:
     unify: true

From b6b4f704254e961a9680d832a5668dd84eb0456f Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Tue, 20 Jan 2026 15:53:15 +1100
Subject: [PATCH 06/10] [no ci] Remove inputs.pr, updated to
 inputs.spack-manifest-path in ci-closed

---
 .github/workflows/cd.yml | 2 +-
 .github/workflows/ci.yml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 30bbebe..ba49ffe 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -69,7 +69,7 @@ jobs:
       spack-manifest-path: ${{ matrix.manifest.path }}
       # We have a custom schema for general software deployment manifests, so we specify it here
       spack-manifest-schema-path: au.org.access-nri/tools/spack/environment/deployment
-      spack-manifest-schema-version: 2-0-0
+      spack-manifest-schema-version: 1-0-0
       config-versions-schema-version: 4-0-0
       config-packages-schema-version: 1-0-0
       # This is a non-model deployment repository, so we do not want to tag the deployment or upload to the build database
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 57ce734..cc0d870 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -108,7 +108,6 @@ jobs:
     uses: access-nri/build-cd/.github/workflows/ci.yml@v8
     with:
       model: ${{ matrix.manifest.name }}
-      pr: ${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.event.issue.number }}
       spack-manifest-path: ${{ matrix.manifest.path }}
       # We have a custom schema for general software deployment manifests, so we specify it here
       spack-manifest-schema-path: au.org.access-nri/tools/spack/environment/deployment
@@ -137,5 +136,5 @@ jobs:
         manifest: ${{ fromJson(needs.setup-pr.outputs.manifest) }}
     uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v8
     with:
-      root-sbd: ${{ matrix.manifest.name }}
+      spack-manifest-path: ${{ matrix.manifest.path }}
     secrets: inherit

From b3f74f210c7c4bbb365345828f5889dc892ab1d3 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 11 Feb 2026 09:03:05 +1100
Subject: [PATCH 07/10] [no ci] Update config/versions.json
 access-spack-packages version to common api-v2 tag

---
 config/versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/versions.json b/config/versions.json
index 5dc4cbd..ef5f303 100644
--- a/config/versions.json
+++ b/config/versions.json
@@ -1,5 +1,5 @@
 {
   "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/4-0-0.json",
   "spack": "1.1",
-  "access-spack-packages": "2025.09.004"
+  "access-spack-packages": "2026.02.002"
 }

From d8a67ed6799f3ffe2cf5302c4b9f81381940c9f5 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Mon, 16 Feb 2026 10:20:36 +1100
Subject: [PATCH 08/10] [no ci] Update language constraints, get in MDR format,
 use MDR schema, update README.md

---
 .github/workflows/cd.yml     |  4 +---
 .github/workflows/ci.yml     |  2 --
 README.md                    | 29 ++++++++++++++++++++---------
 babeltrace2/spack.yaml       | 14 ++++++++++----
 esmf/spack.yaml              | 27 ++++++++++++++++-----------
 fre-nctools/spack.yaml       | 15 ++++++++++-----
 mppnccombine-fast/spack.yaml | 12 ++++++++----
 7 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index ba49ffe..3e8816b 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -67,9 +67,7 @@ jobs:
     with:
       model: ${{ matrix.manifest.name }}
       spack-manifest-path: ${{ matrix.manifest.path }}
-      # We have a custom schema for general software deployment manifests, so we specify it here
-      spack-manifest-schema-path: au.org.access-nri/tools/spack/environment/deployment
-      spack-manifest-schema-version: 1-0-0
+      spack-manifest-schema-version: 2-0-0
       config-versions-schema-version: 4-0-0
       config-packages-schema-version: 1-0-0
       # This is a non-model deployment repository, so we do not want to tag the deployment or upload to the build database
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cc0d870..af352ad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -109,8 +109,6 @@ jobs:
     with:
       model: ${{ matrix.manifest.name }}
       spack-manifest-path: ${{ matrix.manifest.path }}
-      # We have a custom schema for general software deployment manifests, so we specify it here
-      spack-manifest-schema-path: au.org.access-nri/tools/spack/environment/deployment
       spack-manifest-schema-version: 2-0-0
       config-versions-schema-version: 4-0-0
       config-packages-schema-version: 1-0-0
diff --git a/README.md b/README.md
index 496d388..14842d9 100644
--- a/README.md
+++ b/README.md
@@ -9,41 +9,52 @@ Deployment is on to HPC targets, in this case gadi@NCI, utilising the [build-cd]
 ## Supported tools
 
 ### fre-nctools
+
 [FRE-NCtools](https://github.com/NOAA-GFDL/FRE-NCtools) is a collection of tools for creating grids and mosaics commonly used in climate and weather models, the remapping of data among grids, and the creation and manipulation of netCDF files.
 
 ### mppnccombine-fast
+
 [mppnccombine-fast](https://github.com/ACCESS-NRI/mppnccombine-fast) is an accelerated version of the mppnccombine post-processing tool for MOM.
 
 ### babeltrace2
+
 [babeltrace2](https://github.com/efficios/babeltrace) is a CTF (Common Trace Format) trace processing library that provides both a CLI and Python bindings (bt2). It is a required dependency for [esmf-trace](https://github.com/ACCESS-NRI/esmf-trace), which is used to extract and visualise runtime profiling data from ESMF/NUOPC-based configurations.
 
 ### esmf
-[esmf](https://github.com/esmf-org/esmf) is a suite of software tools for developing high-performance, multi-component Earth science modeling applications.
 
+[esmf](https://github.com/esmf-org/esmf) is a suite of software tools for developing high-performance, multi-component Earth science modeling applications.
 
 ## How to use
 
 **Requirements**: you must be a member of [`vk83`](https://my.nci.org.au/mancini/project/vk83).
 
 The software is accessible through the environment module system on `gadi`, e.g.
-```
+
+```sh
 module use /g/data/vk83/modules
 ```
 
 To discover what tools and versions are available:
-```
+
+```sh
 module avail model-tools
-```
+
+```sh
 or a specific tool
-```
+
+```sh
 module avail model-tools/fre-nctools
-```
+
+```sh
 It also works without the `model-tools` namespace:
-```
+
+```sh
 module avail fre-nctools
-```
+
+```sh
 To load the most recent version of `fre-nctools`:
-```
+
+```sh
 module load model-tools/fre-nctools
 ```
 
diff --git a/babeltrace2/spack.yaml b/babeltrace2/spack.yaml
index a8fa3c7..4188634 100644
--- a/babeltrace2/spack.yaml
+++ b/babeltrace2/spack.yaml
@@ -10,13 +10,19 @@ spack:
   specs:
   - babeltrace2@2.1.2
   packages:
-    intel-oneapi-compilers-classic:
+    # Compilers
+    c:
       require:
-      - '@2021.10.0'
+      - intel-oneapi-compilers-classic@2021.10.0
 
-    all:
+    cxx:
       require:
-      - '%access_intel'
+      - intel-oneapi-compilers-classic@2021.10.0
+
+    fortran:
+      require:
+      - intel-oneapi-compilers-classic@2021.10.0
+
   view: true
   concretizer:
     unify: true
diff --git a/esmf/spack.yaml b/esmf/spack.yaml
index 6ec7e03..b375cac 100644
--- a/esmf/spack.yaml
+++ b/esmf/spack.yaml
@@ -12,36 +12,41 @@ spack:
   packages:
     parallelio:
       require:
-      - '@2.6.2+pnetcdf'
+      - '@2.6.2'
+      - '+pnetcdf'
     netcdf-c:
       require:
-      - '@4.9.2 build_system=cmake build_type=RelWithDebInfo'
+      - '@4.9.2'
+      - 'build_system=cmake build_type=RelWithDebInfo'
     netcdf-fortran:
       require:
       - '@4.6.1'
     fms:
       require:
-      - '@git.2024.03 precision=64 +large_file ~gfs_phys ~quad_precision ~openmp'
+      - '@git.2024.03'
+      - 'precision=64 +large_file ~gfs_phys ~quad_precision ~openmp'
     fortranxml:
       require:
       - '@4.1.2'
     openmpi:
       require:
       - '@4.1.7'
-    gcc-runtime:
+
+    # Compilers
+    c:
       require:
-      - '%access_gcc'
-    libiconv:
+      - intel-oneapi-compilers-classic@2021.10.0
+
+    cxx:
       require:
-      - '%access_gcc'
-    # Compilers
-    intel-oneapi-compilers-classic:
+      - intel-oneapi-compilers-classic@2021.10.0
+
+    fortran:
       require:
-      - '@2021.10.0'
+      - intel-oneapi-compilers-classic@2021.10.0
 
     all:
       require:
-      - '%access_intel'
       - 'target=x86_64_v4'
   view: true
   concretizer:
diff --git a/fre-nctools/spack.yaml b/fre-nctools/spack.yaml
index b02ec34..d90dbbf 100644
--- a/fre-nctools/spack.yaml
+++ b/fre-nctools/spack.yaml
@@ -10,9 +10,6 @@ spack:
   specs:
   - fre-nctools@2024.05-1
   packages:
-    fre-nctools:
-      require:
-      - '%access_intel'
     netcdf-c:
       require:
       - '@4.9.2'
@@ -21,9 +18,17 @@ spack:
       - '@4.6.1'
 
     # Compilers
-    intel-oneapi-compilers-classic:
+    c:
+      require:
+      - intel-oneapi-compilers-classic@2021.10.0
+
+    cxx:
+      require:
+      - intel-oneapi-compilers-classic@2021.10.0
+
+    fortran:
       require:
-      - '@2021.10.0'
+      - intel-oneapi-compilers-classic@2021.10.0
   view: true
   concretizer:
     unify: true
diff --git a/mppnccombine-fast/spack.yaml b/mppnccombine-fast/spack.yaml
index b009922..b677752 100644
--- a/mppnccombine-fast/spack.yaml
+++ b/mppnccombine-fast/spack.yaml
@@ -21,13 +21,17 @@ spack:
       - '@5.0.5'
 
     # Compilers
-    intel-oneapi-compilers-classic:
+    c:
       require:
-      - '@2021.10.0'
+      - intel-oneapi-compilers-classic@2021.10.0
 
-    all:
+    cxx:
       require:
-      - '%access_intel'
+      - intel-oneapi-compilers-classic@2021.10.0
+
+    fortran:
+      require:
+      - intel-oneapi-compilers-classic@2021.10.0
   view: true
   concretizer:
     unify: true

From fa619164407949adf7cb3d944445b7522537b4a3 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Tue, 17 Feb 2026 13:27:57 +1100
Subject: [PATCH 09/10] [no ci] Update all projections to remove version as
 build-cd will inject it

---
 babeltrace2/spack.yaml       | 3 ++-
 esmf/spack.yaml              | 3 ++-
 fre-nctools/spack.yaml       | 3 ++-
 mppnccombine-fast/spack.yaml | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/babeltrace2/spack.yaml b/babeltrace2/spack.yaml
index 4188634..dce7a04 100644
--- a/babeltrace2/spack.yaml
+++ b/babeltrace2/spack.yaml
@@ -32,4 +32,5 @@ spack:
         include:
         - babeltrace2
         projections:
-          babeltrace2: 'model-tools/{name}/2.1.2'
+          # build-cd will inject the _version into this projection
+          babeltrace2: 'model-tools/{name}'
diff --git a/esmf/spack.yaml b/esmf/spack.yaml
index b375cac..6e95588 100644
--- a/esmf/spack.yaml
+++ b/esmf/spack.yaml
@@ -62,4 +62,5 @@ spack:
         - fms
         - fortranxml
         projections:
-          esmf: 'model-tools/{name}/v8.7.0'
+          # build-cd will inject the _version into this projection
+          esmf: 'model-tools/{name}'
diff --git a/fre-nctools/spack.yaml b/fre-nctools/spack.yaml
index d90dbbf..9343bb5 100644
--- a/fre-nctools/spack.yaml
+++ b/fre-nctools/spack.yaml
@@ -38,4 +38,5 @@ spack:
         include:
         - fre-nctools
         projections:
-          fre-nctools: 'model-tools/{name}/2024.05-1'
+          # build-cd will inject the _version into this projection
+          fre-nctools: 'model-tools/{name}'
diff --git a/mppnccombine-fast/spack.yaml b/mppnccombine-fast/spack.yaml
index b677752..2d2c0a4 100644
--- a/mppnccombine-fast/spack.yaml
+++ b/mppnccombine-fast/spack.yaml
@@ -41,4 +41,5 @@ spack:
         include:
         - mppnccombine-fast
         projections:
-          mppnccombine-fast: 'model-tools/{name}/2025.07.000'
+          # build-cd will inject the _version into this projection
+          mppnccombine-fast: 'model-tools/{name}'

From 960ab89daa8fc634f2992b7065b12118ec19d157 Mon Sep 17 00:00:00 2001
From: Tommy Gatti <tommy.gatti@anu.edu.au>
Date: Wed, 18 Feb 2026 11:42:14 +1100
Subject: [PATCH 10/10] [no ci] Add build revision to all model-tools

---
 babeltrace2/spack.yaml       | 2 +-
 esmf/spack.yaml              | 2 +-
 mppnccombine-fast/spack.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/babeltrace2/spack.yaml b/babeltrace2/spack.yaml
index dce7a04..d226473 100644
--- a/babeltrace2/spack.yaml
+++ b/babeltrace2/spack.yaml
@@ -6,7 +6,7 @@ spack:
   definitions:
   # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise
   - _name: [babeltrace2]
-  - _version: [2.1.2]
+  - _version: [2.1.2-1]
   specs:
   - babeltrace2@2.1.2
   packages:
diff --git a/esmf/spack.yaml b/esmf/spack.yaml
index 6e95588..9f90f3f 100644
--- a/esmf/spack.yaml
+++ b/esmf/spack.yaml
@@ -6,7 +6,7 @@ spack:
   definitions:
   # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise
   - _name: [esmf]
-  - _version: [v8.7.0]
+  - _version: [v8.7.0-1]
   specs:
   - esmf@git.v8.7.0
   packages:
diff --git a/mppnccombine-fast/spack.yaml b/mppnccombine-fast/spack.yaml
index 2d2c0a4..761d646 100644
--- a/mppnccombine-fast/spack.yaml
+++ b/mppnccombine-fast/spack.yaml
@@ -6,7 +6,7 @@ spack:
   definitions:
   # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise
   - _name: [mppnccombine-fast]
-  - _version: [2025.07.000]
+  - _version: [2025.07.000-1]
   specs:
   - mppnccombine-fast@2025.07.000
   packages: