Skip to content

Commit f9da673

Browse files
committed
Create BUILD and WORK directory macros
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.
1 parent fd5696b commit f9da673

File tree

3 files changed

+244
-218
lines changed

3 files changed

+244
-218
lines changed

.github/actions/testing-setup/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ runs:
2828
run: |
2929
echo "::group::Compile FMS library"
3030
cd .testing
31-
REPORT_ERROR_LOGS=true make deps/lib/libFMS.a -s -j
31+
REPORT_ERROR_LOGS=true make build/deps/lib/libFMS.a -s -j
3232
echo "::endgroup::"
3333
3434
- name: Compile MOM6 in symmetric memory mode

0 commit comments

Comments
 (0)