Skip to content

Infra Update v4 for Special Repos: Support spack.repos, Add Tiered Common Configuration Via spack.include - #10

Merged
CodeGat merged 4 commits into
access/v1.1from
infra-v4
Sep 29, 2026
Merged

CodeGat merged 4 commits into
access/v1.1from
infra-v4

Conversation

@CodeGat

@CodeGat CodeGat commented Sep 21, 2026 •

Copy link
Copy Markdown
Member

Closes #8

Note

This PR incorporates major build-ci changes into this repository, due to the deprecation of inputs.*-spack-packages-ref and inputs.spack-manifest-data-path

Background

More info and motivations in the linked issue, but essentially:

  • Deprecating inputs.*-spack-packages-ref in favor of in-manfiest spack.repos section, like MDRs. By default, it will use the PR branch for access-spack-packages, and the latest access/v1.1 for builtin spack packages. This can be changed via local spack-config config specified in .github/build-ci/config, or alternatively in this repository itself!
  • Deprecating inputs.spack-manifest-data-path in favor of tiered configuration via spack.include.

The two main entrypoints will work as follows with this update:

PR Workflow

builtin spack packages repo: will use the PR branch as normal, via build-ci using the caller repo as the builtin (see the .github/build-ci/config/ section).
access-spack-packages repo: Will use api-v2 branch by default. To use a different branch, edit .github/build-ci/config/repos.yaml and add a access_spack_packages entry like so:

# ...
  access_spack_packages:
    git: https://github.com/ACCESS-NRI/access-spack-packages.git
    branch: YOUR_BRANCH
    destination: $env/package-repos/access-spack-packages

Workflow Dispatch

builtin spack packages repo: Will need to use Use workflow from... dropdown, picking the appropriate builtin branch or tag.
access-spack-packages repo: Will need to use Use workflow from... dropdown, picking the appropriate ASP branch or tag, in which a .github/build-ci/config/repos.yaml is edited to use a different access_spack_packages ref. See above for an example.

The PR

  • Update the workflow entrypoints, as usual!
  • Remove any inputs.spack-manifest-data-path values and inline them into manifests. Delete .github/build-ci/data/standard.json.
  • Remove inputs.*-spack-packages-ref, using the local ASP config to set those values.
  • Add .github/build-ci/config so PRs from this repo use the PR branch, rather than the default access/v1.1 branch. See Base spack.includes for build-ci access-spack-packages#486 for more info on caller configuration.

Testing

Tested in https://github.com/ACCESS-NRI/upstream-spack-packages/actions/runs/35689962216?pr=10 - all packages succeeded except for https://github.com/ACCESS-NRI/upstream-spack-packages/actions/runs/35689962216/job/106626312258?pr=10, this was due to it being excluded in the CICE repo but not upstream.

@CodeGat CodeGat self-assigned this Sep 21, 2026
@CodeGat
CodeGat force-pushed the infra-v4 branch 2 times, most recently from 5c512f4 to 69caf2d Compare September 21, 2026 05:32
…in config that points to the caller builtin repo

@harshula harshula left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed with the help of Claude Opus 5.5 via Zoom VC.

@CodeGat
CodeGat merged commit 7b1211b into access/v1.1 Sep 29, 2026
@CodeGat
CodeGat deleted the infra-v4 branch September 29, 2026 04:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

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

2 participants