diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index c88109a..a2225b3 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@spack-v1-migration_TEST 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..5b500e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,15 +105,14 @@ 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@spack-v1-migration_TEST 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 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 +134,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@spack-v1-migration_TEST with: - root-sbd: ${{ matrix.manifest.name }} + spack-manifest-path: ${{ matrix.manifest.path }} secrets: inherit diff --git a/config/versions.json b/config/versions.json index 3f477ad..f51ddc1 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.06.001" + "$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.06.001" } diff --git a/gh/spack.yaml b/gh/spack.yaml index ccd0491..309d18c 100644 --- a/gh/spack.yaml +++ b/gh/spack.yaml @@ -1,26 +1,30 @@ -# This is a Spack Environment file +# This is a Spack Environment file!! # # It describes a set of packages to be installed, along with # configuration settings. # # This manifest is for installing gh, the GitHub command line interface spack: + definitions: + - _name: [gh] + - _version: [2.49.2-1] specs: - - gh@2.49.2 + - gh@2.49.2 packages: gh: require: - - '%gcc@14.1.0' + - '%access_gcc' + gcc: + require: + - '@15.1.0' all: require: - - 'target=x86_64' + - 'target=x86_64' view: true concretizer: unify: true modules: default: tcl: - include: - - gh projections: - gh: 'system-tools/{name}/{version}' + gh: 'system-tools/{name}' diff --git a/ncdu/spack.yaml b/ncdu/spack.yaml index 878b108..b0eedf1 100644 --- a/ncdu/spack.yaml +++ b/ncdu/spack.yaml @@ -5,12 +5,19 @@ # # This manifest is for installing ncdu, a terminal user interface for du (disk usage) spack: + definitions: + # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise + - _name: [ncdu] + - _version: [1.19] specs: - - ncdu@1.19 + - ncdu@1.19 packages: ncdu: require: - - '%gcc@14.1.0' + - '%access_gcc' + gcc: + require: + - '@14.1.0' view: true concretizer: unify: true @@ -18,6 +25,6 @@ spack: default: tcl: include: - - ncdu + - ncdu projections: ncdu: 'system-tools/{name}/{version}' diff --git a/openssh/spack.yaml b/openssh/spack.yaml index 603db6c..a02fdc5 100644 --- a/openssh/spack.yaml +++ b/openssh/spack.yaml @@ -5,15 +5,22 @@ # # This manifest is for installing openssh, a suite of secure networking utilities based on the SSH protocol spack: + definitions: + # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise + - _name: [openssh] + - _version: [9.8p1] specs: - - openssh@9.9p1 + - openssh@9.9p1 packages: openssh: require: - - '%gcc@14.1.0' + - '%access_gcc' + gcc: + require: + - '@14.1.0' all: require: - - 'target=x86_64' + - 'target=x86_64' view: true concretizer: unify: true @@ -21,6 +28,6 @@ spack: default: tcl: include: - - openssh + - openssh projections: openssh: 'system-tools/{name}/{version}' diff --git a/pinentry/spack.yaml b/pinentry/spack.yaml index c69e3d5..09c8e44 100644 --- a/pinentry/spack.yaml +++ b/pinentry/spack.yaml @@ -5,12 +5,20 @@ # # This manifest is for installing pinentry, a small collection of dialog programs that allow GnuPG to read passphrases and PIN numbers in a secure manner. spack: + definitions: + # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise + - _name: [pinentry] + - _version: [1.3.0] specs: - - pinentry@1.3.0 gui=tty + - pinentry@1.3.0 gui=tty packages: pinentry: require: - - '%gcc@14.1.0' + - '%access_gcc' + + gcc: + require: + - '@14.1.0' view: true concretizer: unify: true @@ -18,6 +26,6 @@ spack: default: tcl: include: - - pinentry + - pinentry projections: pinentry: 'system-tools/{name}/{version}'