Skip to content

Commit

Permalink
Fixes build failure in gitlab pipeline
Browse files Browse the repository at this point in the history
- After a recent update to how the build environment is defined within
MOM6-examples, the "no libraries" build test (unique to MOM6) is failing
because the Makefile now no longer contains the environment. This commit
overrides a CPP macro that points to the bash script that is needed.
  • Loading branch information
adcroft authored and marshallward committed Feb 10, 2023
1 parent 168305f commit 9412c9a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .gitlab/pipeline-ci-tool.sh
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ nolibs-ocean-only-compile () {
cd $JOB_DIR/$STATS_REPO_DIR/$CONFIGS_DIR
mkdir -p build-ocean-only-nolibs-$1
cd build-ocean-only-nolibs-$1
make -f ../tools/MRS/Makefile.build ./$1/env BUILD=. -s
make -f ../tools/MRS/Makefile.build ./$1/env BUILD=. ENVIRON=../../environ -s
../src/mkmf/bin/list_paths -l ../src/MOM6/config_src/{drivers/solo_driver,memory/dynamic_symmetric,infra/FMS1,ext*} ../src/MOM6/src ../src/FMS1
sed -i '/FMS1\/.*\/test_/d' path_names
../src/mkmf/bin/mkmf -t ../src/mkmf/templates/ncrc-$1.mk -p MOM6 -c"-Duse_libMPI -Duse_netCDF" path_names
Expand All @@ -153,7 +153,7 @@ nolibs-ocean-ice-compile () {
cd $JOB_DIR/$STATS_REPO_DIR/$CONFIGS_DIR
mkdir -p build-ocean-ice-nolibs-$1
cd build-ocean-ice-nolibs-$1
make -f ../tools/MRS/Makefile.build ./$1/env BUILD=. -s
make -f ../tools/MRS/Makefile.build ./$1/env BUILD=. ENVIRON=../../environ -s
../src/mkmf/bin/list_paths -l ../src/MOM6/config_src/{drivers/FMS_cap,memory/dynamic_symmetric,infra/FMS1,ext*} ../src/MOM6/src ../src/SIS2/*src ../src/{FMS1,coupler,icebergs,ice_param,land_null,atmos_null}
sed -i '/FMS1\/.*\/test_/d' path_names
../src/mkmf/bin/mkmf -t ../src/mkmf/templates/ncrc-$1.mk -p MOM6 -c"-Duse_libMPI -Duse_netCDF -D_USE_LEGACY_LAND_ -Duse_AM3_physics" path_names
Expand Down

0 comments on commit 9412c9a

Please sign in to comment.