From 34dab10fc7487fc19235a9c4763ce1ab58d1f7ce Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 4 Nov 2025 11:18:07 +1100 Subject: [PATCH 01/21] Test out github-hosted variant --- .github/workflows/ci.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbcab0c..6510781 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,11 +29,14 @@ jobs: max-parallel: 5 matrix: file: ${{ fromJson(needs.pre-ci.outputs.matrix) }} - uses: access-nri/build-ci/.github/workflows/ci.yml@v2 + # Testing on github-hosted as the image is not yet updated on self-hosted runners + uses: access-nri/build-ci/.github/workflows/ci-github-hosted.yml@spack-config-81-git-based-spack-packages-repo_TEST 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 - # spack-packages-ref: main - # spack-config-ref: main - # spack-ref: releases/v0.22 + spack-config-ref: access-spack-packages-as-git-repo + builtin-spack-packages-ref: '2025.07.0' + access-spack-packages-ref: api-v2 + spack-ref: releases/v1.0 # Just to test the re-checkout + container-image-version: rocky-v1.0-test # This is the new image that will be pushed From b11a5ba9bd697fcd01af92fc7cf9d5054accbe68 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 4 Nov 2025 11:30:57 +1100 Subject: [PATCH 02/21] Add `:` tag specifier --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6510781..f8fe88a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,4 +39,4 @@ jobs: builtin-spack-packages-ref: '2025.07.0' access-spack-packages-ref: api-v2 spack-ref: releases/v1.0 # Just to test the re-checkout - container-image-version: rocky-v1.0-test # This is the new image that will be pushed + container-image-version: :rocky-v1.0-test # This is the new image that will be pushed From db32b130202bcd9449fe4fec574ef145ea3238a2 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 4 Nov 2025 11:45:01 +1100 Subject: [PATCH 03/21] Recheck after inputs.repository fix in spack-checkout-git-ref action From e7ff8cd3d6f23c8e2a311e5fae65ae6e86131f8f Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 4 Nov 2025 13:48:15 +1100 Subject: [PATCH 04/21] Recheck after allowing spack checkouts to use local repos From 57d22bf36bdb21dc0645ba76314427c3d9a5e39c Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 4 Nov 2025 13:55:42 +1100 Subject: [PATCH 05/21] Update builtin-spack-packages-ref to v2025.07.0 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8fe88a..7e5959a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: 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 spack-config-ref: access-spack-packages-as-git-repo - builtin-spack-packages-ref: '2025.07.0' + builtin-spack-packages-ref: v2025.07.0 access-spack-packages-ref: api-v2 spack-ref: releases/v1.0 # Just to test the re-checkout container-image-version: :rocky-v1.0-test # This is the new image that will be pushed From 1769cb8d1353052fe3fefb76eb33637e78731a78 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 4 Nov 2025 14:40:40 +1100 Subject: [PATCH 06/21] Attempt with spack v1-style manifests --- .github/build-ci/manifests/gcc.spack.yaml.j2 | 11 ++++++++++- .github/build-ci/manifests/intel.spack.yaml.j2 | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/build-ci/manifests/gcc.spack.yaml.j2 b/.github/build-ci/manifests/gcc.spack.yaml.j2 index b6c51d1..9b31cfe 100644 --- a/.github/build-ci/manifests/gcc.spack.yaml.j2 +++ b/.github/build-ci/manifests/gcc.spack.yaml.j2 @@ -2,9 +2,18 @@ spack: specs: - access-test-component @git.{{ ref }} packages: + c: + require: + - '{{ gcc_compiler }}' + cxx: + require: + - '{{ gcc_compiler }}' + fortran: + require: + - '{{ gcc_compiler }}' all: require: - - '%{{ gcc_compiler }} target={{ target}}' + - 'target={{ target}}' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/intel.spack.yaml.j2 b/.github/build-ci/manifests/intel.spack.yaml.j2 index 041805c..5c21106 100644 --- a/.github/build-ci/manifests/intel.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel.spack.yaml.j2 @@ -2,9 +2,18 @@ spack: specs: - access-test-component @git.{{ ref }} packages: + c: + require: + - 'intel-oneapi-compilers-classic@2021.10.0' + cxx: + require: + - 'intel-oneapi-compilers-classic@2021.10.0' + fortran: + require: + - 'intel-oneapi-compilers-classic@2021.10.0' all: require: - - '%{{ intel_compiler }} target={{ target }}' + - 'target={{ target }}' concretizer: unify: false view: false From d94d0550235eda0fa4bf37eb98ed46991465ff70 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 7 Nov 2025 10:49:07 +1100 Subject: [PATCH 07/21] Turn on ssh --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e5959a..0a7adbe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: uses: access-nri/build-ci/.github/workflows/ci-github-hosted.yml@spack-config-81-git-based-spack-packages-repo_TEST with: spack-manifest-path: ${{ matrix.file }} - allow-ssh-into-spack-install: false # If true, PR author must ssh into instance to complete job + allow-ssh-into-spack-install: true # If true, PR author must ssh into instance to complete job spack-manifest-data-path: .github/build-ci/data/standard.json spack-config-ref: access-spack-packages-as-git-repo builtin-spack-packages-ref: v2025.07.0 From 7071c06482c640c55ed1a2b162ee001c9551ee2c Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 11 Nov 2025 10:40:29 +1100 Subject: [PATCH 08/21] Basic test with datetime-fortran --- .github/build-ci/manifests/gcc.spack.yaml.j2 | 2 +- .github/build-ci/manifests/intel.spack.yaml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/build-ci/manifests/gcc.spack.yaml.j2 b/.github/build-ci/manifests/gcc.spack.yaml.j2 index 9b31cfe..316be7f 100644 --- a/.github/build-ci/manifests/gcc.spack.yaml.j2 +++ b/.github/build-ci/manifests/gcc.spack.yaml.j2 @@ -1,6 +1,6 @@ spack: specs: - - access-test-component @git.{{ ref }} + - datetime-fortran packages: c: require: diff --git a/.github/build-ci/manifests/intel.spack.yaml.j2 b/.github/build-ci/manifests/intel.spack.yaml.j2 index 5c21106..f867075 100644 --- a/.github/build-ci/manifests/intel.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel.spack.yaml.j2 @@ -1,6 +1,6 @@ spack: specs: - - access-test-component @git.{{ ref }} + - datetime-fortran packages: c: require: From d8ceab2abe50c3d3d624ebfa557d542c076f0114 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 11 Nov 2025 13:11:29 +1100 Subject: [PATCH 09/21] Change to commit refs for `inputs.*-spack-packages-ref` --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a7adbe..ba1f62c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: allow-ssh-into-spack-install: true # If true, PR author must ssh into instance to complete job spack-manifest-data-path: .github/build-ci/data/standard.json spack-config-ref: access-spack-packages-as-git-repo - builtin-spack-packages-ref: v2025.07.0 - access-spack-packages-ref: api-v2 + builtin-spack-packages-ref: 8e33ef611d39211f80553a726c5cec8a3d3be4a5 + access-spack-packages-ref: 953cd6c325c5584d0772b0a1b754e8abd2c9911f spack-ref: releases/v1.0 # Just to test the re-checkout container-image-version: :rocky-v1.0-test # This is the new image that will be pushed From 1fe6c69b02a9ea7565f149518d76c78601e0dbd3 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 11 Nov 2025 15:57:23 +1100 Subject: [PATCH 10/21] Test after fixing failure to find future ref SHA! From a47f8accfd080dedd0c9177a00903000d6b4fb38 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 12 Nov 2025 10:34:00 +1100 Subject: [PATCH 11/21] Test spack version < 1.0 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba1f62c..0b24d90 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,5 +38,5 @@ jobs: spack-config-ref: access-spack-packages-as-git-repo builtin-spack-packages-ref: 8e33ef611d39211f80553a726c5cec8a3d3be4a5 access-spack-packages-ref: 953cd6c325c5584d0772b0a1b754e8abd2c9911f - spack-ref: releases/v1.0 # Just to test the re-checkout + spack-ref: releases/v0.22 # Testing invalid spack ref for this version of the workflow container-image-version: :rocky-v1.0-test # This is the new image that will be pushed From 57602bbc458a4b74aad729e93536099eb8aa1cbe Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 12 Nov 2025 10:42:40 +1100 Subject: [PATCH 12/21] Test with < 1.0.0 tag --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b24d90..e50d6d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,5 +38,5 @@ jobs: spack-config-ref: access-spack-packages-as-git-repo builtin-spack-packages-ref: 8e33ef611d39211f80553a726c5cec8a3d3be4a5 access-spack-packages-ref: 953cd6c325c5584d0772b0a1b754e8abd2c9911f - spack-ref: releases/v0.22 # Testing invalid spack ref for this version of the workflow + spack-ref: v0.22.5 # Testing invalid spack ref for this version of the workflow container-image-version: :rocky-v1.0-test # This is the new image that will be pushed From 477fbf2333d5dd9b3eb21ecf459b9a1ef6b8124a Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 12 Nov 2025 10:53:37 +1100 Subject: [PATCH 13/21] Test out tag that is in our fork --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e50d6d9..cc93ed4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,5 +38,5 @@ jobs: spack-config-ref: access-spack-packages-as-git-repo builtin-spack-packages-ref: 8e33ef611d39211f80553a726c5cec8a3d3be4a5 access-spack-packages-ref: 953cd6c325c5584d0772b0a1b754e8abd2c9911f - spack-ref: v0.22.5 # Testing invalid spack ref for this version of the workflow + spack-ref: v0.22.2 # Testing invalid spack ref for this version of the workflow container-image-version: :rocky-v1.0-test # This is the new image that will be pushed From f2ec0ca224c7fec0d6907bfef5a14a38340a8723 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 12 Nov 2025 11:27:57 +1100 Subject: [PATCH 14/21] Test out commit in the fork --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc93ed4..6cf633b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,5 +38,5 @@ jobs: spack-config-ref: access-spack-packages-as-git-repo builtin-spack-packages-ref: 8e33ef611d39211f80553a726c5cec8a3d3be4a5 access-spack-packages-ref: 953cd6c325c5584d0772b0a1b754e8abd2c9911f - spack-ref: v0.22.2 # Testing invalid spack ref for this version of the workflow + spack-ref: 2bfcc69fa870d3c6919be87593f22647981b648a # Testing invalid spack ref for this version of the workflow container-image-version: :rocky-v1.0-test # This is the new image that will be pushed From 6c3594c5dd45c8862e8be571150edce3d290d6e0 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 13 Nov 2025 09:36:43 +1100 Subject: [PATCH 15/21] Update manifests to return to access-test-component --- .github/build-ci/manifests/gcc.spack.yaml.j2 | 4 ++-- .github/build-ci/manifests/intel.spack.yaml.j2 | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/build-ci/manifests/gcc.spack.yaml.j2 b/.github/build-ci/manifests/gcc.spack.yaml.j2 index 316be7f..5d40e1d 100644 --- a/.github/build-ci/manifests/gcc.spack.yaml.j2 +++ b/.github/build-ci/manifests/gcc.spack.yaml.j2 @@ -1,6 +1,6 @@ spack: specs: - - datetime-fortran + - access-test-component@git.{{ ref }} %{{ gcc_compiler }} target={{ target }} packages: c: require: @@ -13,7 +13,7 @@ spack: - '{{ gcc_compiler }}' all: require: - - 'target={{ target}}' + - 'target={{ target }}' concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/intel.spack.yaml.j2 b/.github/build-ci/manifests/intel.spack.yaml.j2 index f867075..5f77b1e 100644 --- a/.github/build-ci/manifests/intel.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel.spack.yaml.j2 @@ -1,16 +1,16 @@ spack: specs: - - datetime-fortran + - access-test-component@git.{{ ref }} %{{ intel_compiler }} target={{ target }} packages: c: require: - - 'intel-oneapi-compilers-classic@2021.10.0' + - 'intel-oneapi-compilers@2025.2.0' cxx: require: - - 'intel-oneapi-compilers-classic@2021.10.0' + - 'intel-oneapi-compilers@2025.2.0' fortran: require: - - 'intel-oneapi-compilers-classic@2021.10.0' + - 'intel-oneapi-compilers@2025.2.0' all: require: - 'target={{ target }}' From 5e6f74ac82821518bfeb0392cbab4cd7fda0655c Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 13 Nov 2025 09:45:13 +1100 Subject: [PATCH 16/21] Remove explicit refs, update container-image-version --- .github/workflows/ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6cf633b..f1cc9fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,8 +35,4 @@ jobs: spack-manifest-path: ${{ matrix.file }} allow-ssh-into-spack-install: true # If true, PR author must ssh into instance to complete job spack-manifest-data-path: .github/build-ci/data/standard.json - spack-config-ref: access-spack-packages-as-git-repo - builtin-spack-packages-ref: 8e33ef611d39211f80553a726c5cec8a3d3be4a5 - access-spack-packages-ref: 953cd6c325c5584d0772b0a1b754e8abd2c9911f - spack-ref: 2bfcc69fa870d3c6919be87593f22647981b648a # Testing invalid spack ref for this version of the workflow - container-image-version: :rocky-v1.0-test # This is the new image that will be pushed + container-image-version: :rocky-v1.0-2025.11.001 From 04c5547ceca7ffe0d6660dda12fd2027b4db9260 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 13 Nov 2025 09:58:18 +1100 Subject: [PATCH 17/21] Retest after incorrectly applied commits in `build-ci` --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1cc9fc..b0daf46 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,6 +33,6 @@ jobs: uses: access-nri/build-ci/.github/workflows/ci-github-hosted.yml@spack-config-81-git-based-spack-packages-repo_TEST with: spack-manifest-path: ${{ matrix.file }} - allow-ssh-into-spack-install: true # If true, PR author must ssh into instance to complete job + 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 container-image-version: :rocky-v1.0-2025.11.001 From cbc9c77ab6f2defb45660d142792fb8d8e4a37a9 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 14 Nov 2025 15:41:38 +1100 Subject: [PATCH 18/21] Test after fixing get-git-ref-info bug with non-checked-out branches! From e1960515b648ae64b238a2803b0f81005e1e448e Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 14 Nov 2025 16:11:43 +1100 Subject: [PATCH 19/21] Update intel manifest to use intel-oneapi-compilers@2025.2.0 --- .github/build-ci/manifests/intel.spack.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/build-ci/manifests/intel.spack.yaml.j2 b/.github/build-ci/manifests/intel.spack.yaml.j2 index 5f77b1e..d974647 100644 --- a/.github/build-ci/manifests/intel.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel.spack.yaml.j2 @@ -1,6 +1,6 @@ spack: specs: - - access-test-component@git.{{ ref }} %{{ intel_compiler }} target={{ target }} + - access-test-component@git.{{ ref }} %intel-oneapi-compilers@2025.2.0 target={{ target }} packages: c: require: From 1bd32e994de4d9f6a1cc93bdf770d92b195d0a83 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 2 Dec 2025 09:28:25 +1100 Subject: [PATCH 20/21] Test using kubernetes-hosted --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0daf46..35c2b45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,9 +30,9 @@ jobs: matrix: file: ${{ fromJson(needs.pre-ci.outputs.matrix) }} # Testing on github-hosted as the image is not yet updated on self-hosted runners - uses: access-nri/build-ci/.github/workflows/ci-github-hosted.yml@spack-config-81-git-based-spack-packages-repo_TEST + uses: access-nri/build-ci/.github/workflows/ci.yml@spack-config-81-git-based-spack-packages-repo_TEST 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 - container-image-version: :rocky-v1.0-2025.11.001 + container-image-version: :rocky-v1.0-2025.12.000-test From 0c64628e59664de8f382093ed6bd5bcb67f253b4 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 2 Dec 2025 09:32:45 +1100 Subject: [PATCH 21/21] Update to v1.1 image --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35c2b45..f2f262d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,4 +35,4 @@ jobs: 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 - container-image-version: :rocky-v1.0-2025.12.000-test + container-image-version: :rocky-v1.1-2025.12.000-test