Conversation
acfc5ab to
b5509e5
Compare
… builtin, and both
|
Validated that this structure works with ACCESS-NRI/build-ci@43c75ab and ACCESS-NRI/access-spack-packages@81e6045 For PRs from component repositoriesSee https://github.com/ACCESS-NRI/MOM6/actions/runs/33574388321 (explicitly not including the ASP-specific CI in https://github.com/ACCESS-NRI/MOM6/actions/runs/33574388321/job/100075540562#step:20:1094 For PRs from ASPI tested this manually by setting the appropriate environment variables in a docker container, simulating (some of) the build-ci workflow: $ docker run -it --rm ghcr.io/access-nri/build-ci-upstream:rocky
$ mkdir opt/repos
$ git clone https://github.com/access-nri/mom6.git opt/repos/MOM6 --branch infra-v4 # this is our CR
$ git clone https://github.com/access-nri/access-spack-packages.git opt/repos/access-spack-packages --branch 484-top-level-includes # this is our caller, ASP
$ export USE_CALLER_REPOSITORY_PATH=1 # Set as a repo-level var in github
$ export SPACK_MANIFEST_REPOSITORY_PATH=/opt/repos/MOM6 # set in build-ci
$ export CALLER_REPOSITORY_PATH=/opt/repos/access-spack-packages/ # set in build-ci
$ export CALLER_REPOSITORY_PATH_CONFIG=/opt/repos/access-spack-packages/.github/build-ci/include/ASP-ci # set in build-ci, as well
I then removed the jinja templating from opt/repos/MOM6/.github/build-ci/manifests/oneapi_mom6_solo.spack.yaml.j2
$ spack -d env create default opt/repos/MOM6/.github/build-ci/manifests/oneapi_mom6_solo.spack.yaml.j2
==> Warning: Skipping copy of non-existent include path: '$SPACK_MANIFEST_REPOSITORY_PATH/.github/build-ci/include'
remote: Enumerating objects: 20373, done.
remote: Counting objects: 100% (20373/20373), done.
remote: Compressing objects: 100% (10991/10991), done.
remote: Total 20373 (delta 1335), reused 14167 (delta 1165), pack-reused 0 (from 0)
==> Created environment default in: /opt/environments/default
==> Activate with: spack env activate default |
7f75fcc to
afed869
Compare
|
This now works with the updated structure in ACCESS-NRI/access-spack-packages#486 |
…update ci actions/checkout to v7
76d38f4 to
2699a76
Compare
|
Just wanted to note @aidanheerdegen that we can't remove the branch reference from https://github.com/ACCESS-NRI/MOM6/pull/74/changes#diff-1e8e993b87e4f9cc9d1c3b5f43394649ea4c77fa63587f76059267e561111d18R4 as it's a required bit of information - no default branch magic unfortunately! |
Closes #73
Note
This PR is currently being used for testing, and will be reformatted once testing completes
Background
More info and motivations in the linked issue, but essentially:
inputs.*-spack-packages-refin favor of in-manfiestspack.repossection, like MDRs.inputs.spack-manifest-data-pathin favor of tiered configuration viaspack.inclue.The PR
inputs.*-spack-packages-refs and transplant them into manifestsspack.repossectionsinputs.spack-manifest-data-pathand replace that withspack.includeentries, either from Add top-levelspack.includesdefault access-spack-packages#484 or a CR-level manifest to include.Testing
See below!