forked from mom-ocean/MOM6
-
Notifications
You must be signed in to change notification settings - Fork 4
Infra Update v4: Support spack.repos and spack.include
#74
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
CodeGat
wants to merge
15
commits into
2026.05
Choose a base branch
from
infra-v4
base: 2026.05
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 4 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
5d7f56c
TEST: Manifests with no spack.repos, only access-spack-packages, only…
CodeGat f06d742
TEST: Use included configuration from ASP
CodeGat 66e82e7
TEST: CR-level includes
CodeGat d2e12db
TEST: env-based includes via build-ci branch, jinja vars for ASP vers…
CodeGat 3c49775
Test out multilayer includes - one for CR, one for ASP
CodeGat d1ec773
Simplify the rest
CodeGat 208b716
TEST: Use conditional includes rather than nested includes
CodeGat d98bf2f
[no ci] Remove unneeded entries in datafile
CodeGat 4946f0c
Update comments and variable names
CodeGat 32a4053
Propagate oneapi down the root package
CodeGat ea88d92
Delete datafile, update include
CodeGat afed869
Push down CR/ASP decision to ASPs ci include, use CI v4 branch
CodeGat 2699a76
Rename .github/build-ci/include to .../config, update all manifests, …
CodeGat d559302
Test after updating upstream/runner image to rocky-v1.1-2026.05.002
CodeGat 3426944
Update branch specification to api-v2 for include
CodeGat File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| { | ||
| "oneapi_compiler_version": "2025.2.0", | ||
| "target": "x86_64" | ||
| "access_spack_packages_ref": "484-top-level-includes", | ||
| "access_spack_packages_ref_type": "branch" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| packages: | ||
| access3: | ||
| require: | ||
| - 'configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3' |
27 changes: 8 additions & 19 deletions
27
.github/build-ci/manifests/oneapi_access-om3_asymm.spack.yaml.j2
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,16 @@ | ||
| spack: | ||
| include: | ||
| # Include base configuration from access-spack-packages/.github/build-ci/includes | ||
| - git: https://github.com/ACCESS-NRI/access-spack-packages | ||
| {{ access_spack_packages_ref_type }}: {{ access_spack_packages_ref }} | ||
| paths: | ||
| - .github/build-ci/includes/oneapi | ||
| # Include configuration from this repositories .github/build-ci/includes directory, environment variable defined in the ci.yml | ||
| - path: $SPACK_MANIFEST_REPOSITORY_PATH/.github/build-ci/includes | ||
| specs: | ||
| - 'access-om3@latest ^openmpi' | ||
| packages: | ||
| cmake: | ||
| require: | ||
| - '@3.31.6:' | ||
| access3: | ||
| require: | ||
| - 'configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3' | ||
| access-mom6: | ||
| require: | ||
| - '@git.{{ ref }}=stable +asymmetric_mem +mom6_solo' | ||
| gcc-runtime: | ||
| require: | ||
| - '%access_gcc' | ||
| - 'target={{ target }}' | ||
| intel-oneapi-compilers: | ||
| require: | ||
| - '@{{ oneapi_compiler_version }}' | ||
| all: | ||
| require: | ||
| - '%access_oneapi' | ||
| - 'target={{ target }}' | ||
| concretizer: | ||
| unify: false | ||
| view: false | ||
27 changes: 8 additions & 19 deletions
27
.github/build-ci/manifests/oneapi_access-om3_symm.spack.yaml.j2
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,16 @@ | ||
| spack: | ||
| include: | ||
| # Include base configuration from access-spack-packages/.github/build-ci/includes | ||
| - git: https://github.com/ACCESS-NRI/access-spack-packages | ||
| {{ access_spack_packages_ref_type }}: {{ access_spack_packages_ref }} | ||
| paths: | ||
| - .github/build-ci/includes/oneapi | ||
| # Include configuration from this repositories .github/build-ci/includes directory, environment variable defined in the ci.yml | ||
| - path: $SPACK_MANIFEST_REPOSITORY_PATH/.github/build-ci/includes | ||
| specs: | ||
| - 'access-om3@latest ^openmpi' | ||
| packages: | ||
| cmake: | ||
| require: | ||
| - '@3.31.6:' | ||
| access3: | ||
| require: | ||
| - 'configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3' | ||
| access-mom6: | ||
| require: | ||
| - '@git.{{ ref }}=stable ~asymmetric_mem +mom6_solo' | ||
| gcc-runtime: | ||
| require: | ||
| - '%access_gcc' | ||
| - 'target={{ target }}' | ||
| intel-oneapi-compilers: | ||
| require: | ||
| - '@{{ oneapi_compiler_version }}' | ||
| all: | ||
| require: | ||
| - '%access_oneapi' | ||
| - 'target={{ target }}' | ||
| concretizer: | ||
| unify: false | ||
| view: false |
25 changes: 8 additions & 17 deletions
25
.github/build-ci/manifests/oneapi_mom6_access3.spack.yaml.j2
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,12 @@ | ||
| spack: | ||
| include: | ||
| # Include base configuration from access-spack-packages/.github/build-ci/includes | ||
| - git: https://github.com/ACCESS-NRI/access-spack-packages | ||
| {{ access_spack_packages_ref_type }}: {{ access_spack_packages_ref }} | ||
| paths: | ||
| - .github/build-ci/includes/oneapi | ||
| # Include configuration from this repositories .github/build-ci/includes directory, environment variable defined in the ci.yml | ||
| - path: $SPACK_MANIFEST_REPOSITORY_PATH/.github/build-ci/includes | ||
| specs: | ||
| - 'access-mom6@git.{{ ref }}=stable +access3 ~mom6_solo ^openmpi' | ||
| packages: | ||
| cmake: | ||
| require: | ||
| - '@3.31.6:' | ||
| gcc-runtime: | ||
| require: | ||
| - '%access_gcc' | ||
| - 'target={{ target }}' | ||
| intel-oneapi-compilers: | ||
| require: | ||
| - '@{{ oneapi_compiler_version }}' | ||
| all: | ||
| require: | ||
| - '%access_oneapi' | ||
| - 'target={{ target }}' | ||
| concretizer: | ||
| unify: false | ||
| view: false |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,12 @@ | ||
| spack: | ||
| include: | ||
| # Include base configuration from access-spack-packages/.github/build-ci/includes | ||
| - git: https://github.com/ACCESS-NRI/access-spack-packages | ||
| {{ access_spack_packages_ref_type }}: {{ access_spack_packages_ref }} | ||
| paths: | ||
| - .github/build-ci/includes/oneapi | ||
| # Include configuration from this repositories .github/build-ci/includes directory, environment variable defined in the ci.yml | ||
| - path: $SPACK_MANIFEST_REPOSITORY_PATH/.github/build-ci/includes | ||
| specs: | ||
| - 'access-mom6@git.{{ ref }}=stable ~access3 +mom6_solo ^openmpi' | ||
| packages: | ||
| cmake: | ||
| require: | ||
| - '@3.31.6:' | ||
| gcc-runtime: | ||
| require: | ||
| - '%access_gcc' | ||
| - 'target={{ target }}' | ||
| intel-oneapi-compilers: | ||
| require: | ||
| - '@{{ oneapi_compiler_version }}' | ||
| all: | ||
| require: | ||
| - '%access_oneapi' | ||
| - 'target={{ target }}' | ||
| concretizer: | ||
| unify: false | ||
| view: false |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.