Infra Update v4: Support spack.repos, Add Tiered Common Configuration Via spack.include

.github/build-ci/config/include.yaml

@@ -0,0 +1,6 @@
+# This file is included via the manifest
+include:
+  - git: https://github.com/ACCESS-NRI/access-spack-packages
+    branch: api-v2
+    paths:
+    - .github/build-ci/config/include

.github/build-ci/manifests/gcc.spack.yaml.j2

@@ -1,17 +1,14 @@
 spack:
+  include:
+  # Include configuration from this repository, with the environment variable defined in build-ci
+  - path: $SPACK_MANIFEST_REPOSITORY_PATH/.github/build-ci/config
   specs:
-  - access3 @git.{{ ref }}=stable configurations={{ all_configurations }}
+  - access3 @git.{{ ref }}=stable configurations=MOM6,CICE6,WW3,MOM6-WW3,MOM6-CICE6,CICE6-WW3,MOM6-CICE6-WW3
   packages:
     access3-share:
       require:
         '@git.{{ ref }}=stable'
-    gcc:
-      require:
-      - '@{{ gcc_compiler_version }}'
     all:
       require:
       - '%access_gcc'
-      - target={{ target }}
-  concretizer:
-    unify: false
   view: false

.github/build-ci/manifests/intel-libonly.spack.yaml.j2

@@ -1,20 +1,12 @@
 spack:
+  include:
+  # Include configuration from this repository, with the environment variable defined in build-ci
+  - path: $SPACK_MANIFEST_REPOSITORY_PATH/.github/build-ci/config
   specs:
   - access3-share @git.{{ ref }}=stable
   - access3-share @git.{{ ref }}=stable +openmp
   packages:
-    # We pin a version of python as spack v1.1 has trouble building the default latest 
-    # python@3.14.3%intel@2021.10.0 due to a segfault. 
-    python:
-      require:
-      - '@3.11.14'
-    intel-oneapi-compilers-classic:
-      require:
-      - '@{{ intel_compiler_version }}'
     all:
       require:
       - '%access_intel'
-      - target={{ target }}
-  concretizer:
-    unify: false
   view: false

.github/build-ci/manifests/intel.spack.yaml.j2

@@ -1,22 +1,14 @@
 spack:
+  include:
+  # Include configuration from this repository, with the environment variable defined in build-ci
+  - path: $SPACK_MANIFEST_REPOSITORY_PATH/.github/build-ci/config
   specs:
-  - access3 @git.{{ ref }}=stable configurations={{ all_configurations }}
+  - access3 @git.{{ ref }}=stable configurations=MOM6,CICE6,WW3,MOM6-WW3,MOM6-CICE6,CICE6-WW3,MOM6-CICE6-WW3
   packages:
     access3-share:
       require:
         '@git.{{ ref }}=stable'
-    # We pin a version of python as spack v1.1 has trouble building the default latest 
-    # python@3.14.3%intel@2021.10.0 due to a segfault. 
-    python:
-      require:
-      - '@3.11.14'
-    intel-oneapi-compilers-classic:
-      require:
-      - '@{{ intel_compiler_version }}'
     all:
       require:
       - '%access_intel'
-      - target={{ target }}
-  concretizer:
-    unify: false
   view: false

.github/build-ci/manifests/oneapi.spack.yaml.j2

@@ -1,20 +1,14 @@
 spack:
+  include:
+  # Include configuration from this repository, with the environment variable defined in build-ci
+  - path: $SPACK_MANIFEST_REPOSITORY_PATH/.github/build-ci/config
   specs:
-  - access3 @git.{{ ref }}=stable configurations={{ all_configurations }}
+  - access3 @git.{{ ref }}=stable configurations=MOM6,CICE6,WW3,MOM6-WW3,MOM6-CICE6,CICE6-WW3,MOM6-CICE6-WW3
   packages:
     access3-share:
       require:
         '@git.{{ ref }}=stable'
-    gcc-runtime:
-      require:
-        '%access_gcc'
-    intel-oneapi-compilers:
-      require:
-      - '@{{ oneapi_compiler_version }}'
     all:
       require:
       - '%access_oneapi'
-      - target={{ target }}
-  concretizer:
-    unify: false
   view: false

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
       - name: Set up matrix
         id: set-matrix
@@ -30,10 +30,8 @@ jobs:
       max-parallel: 5
       matrix:
         file: ${{ fromJson(needs.pre-ci.outputs.matrix) }}
-    uses: access-nri/build-ci/.github/workflows/ci.yml@v3
+    uses: access-nri/build-ci/.github/workflows/ci.yml@v4
     with:
       spack-manifest-path: ${{ matrix.file }}
       allow-ssh-into-spack-install: false  # If true, PR author must ssh into instance to complete job
-      spack-manifest-data-path: .github/build-ci/data/standard.json
-      # Default args (including explicit spack/spack-packages/spack-config versions)
-      # are specified in https://github.com/ACCESS-NRI/build-ci/tree/v3/.github/workflows#inputs
+      # More args, including setting spack/spack-config refs, can be found in https://github.com/ACCESS-NRI/build-ci/blob/v4/.github/workflows/README.md