Create BUILD and WORK directory macros#578
Merged
marshallward merged 2 commits intoMar 5, 2024
Merged
Conversation
This patch introduces two new macros, BUILD and WORK, to permit relocation of the build/ and work/ directories. It also makes the following smaller changes: * deps/ is now defined by the DEPS macro. If unset, deps/ is placed in the BUILD directory. * results/ is moved into WORK. * Compiler flags which track directories now use $(abspath ...) to allow for arbitrary paths. * GitHub CI paths were adjusted to support these new settings. * DO_* flags are now used as on/off with ifdef testing, rather than checking for `true` values. * mkmf macros have been removed from the coupled test config. * The default FMS infra has been changed to FMS2 in all components, including the configure.ac outside of .testing. This work will enable testing of multiple FMS libraries in our CI.
Member
Author
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## dev/gfdl #578 +/- ##
=========================================
Coverage 37.20% 37.21%
=========================================
Files 271 271
Lines 80472 80472
Branches 15008 15008
=========================================
+ Hits 29943 29949 +6
+ Misses 44957 44950 -7
- Partials 5572 5573 +1 ☔ View full report in Codecov by Sentry. |
adcroft
approved these changes
Mar 5, 2024
Member
adcroft
left a comment
adcroft
left a comment
There was a problem hiding this comment.
Looks good and works for me. Pipeline passed at https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/commit/e350393c310e5bf039e809249bba7811eb666d76
Member
Author
|
Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/22527 ✔️ Still finishing up, but the relevant part has passed. |
This was referenced May 16, 2024
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This patch introduces two new macros,
BUILDandWORK, to permit relocation of thebuild/andwork/directories. It also makes the following smaller changes:deps/is now defined by theDEPSmacro. If unset,deps/is placed in theBUILDdirectory.results/is moved intoWORK.Compiler flags which track directories now use
$(abspath ...)to allow for arbitrary paths.GitHub CI paths were adjusted to support these new settings.
DO_*flags are now used as on/off withifdeftesting, rather than checking fortruevalues.mkmf macros have been removed from the coupled test config.
The default FMS infra has been changed to FMS2 in all components, including the
configure.acoutside of.testing.This work will enable testing of multiple FMS libraries in our CI.