Skip to content
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

Create BUILD and WORK directory macros #578

Merged
merged 2 commits into from
Mar 5, 2024

Conversation

marshallward
Copy link
Member

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.

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.
@marshallward
Copy link
Member Author

The problems with external BUILD in #563 appears to be fixed, and the suggestion by @adcroft has been implemented.

Copy link

codecov bot commented Mar 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 37.21%. Comparing base (fd5696b) to head (a6ff7dc).

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.
📢 Have feedback on the report? Share it here.

Copy link
Member

@adcroft adcroft left a comment

Choose a reason for hiding this comment

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

@marshallward
Copy link
Member Author

Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/22527 ✔️

Still finishing up, but the relevant part has passed.

@marshallward marshallward merged commit f9da673 into NOAA-GFDL:dev/gfdl Mar 5, 2024
14 checks passed
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.

2 participants