Skip to content

Fix Github Action builds #632

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.

Sign up for GitHub

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

Merged
aliabdolali merged 1 commit into from
Mar 8, 2022
Merged

Fix Github Action builds #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/gnu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: GNU Linux Build
on: [push, pull_request]

env:
cache_key: gnu3
cache_key: gnu4
CC: gcc-10
FC: gfortran-10
CXX: g++-10
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
spack env create ww3-gnu ww3/model/ci/spack.yaml
spack env activate ww3-gnu
spack compiler find
spack external find m4 cmake pkgconf openssl
spack external find
spack add mpich@3.4.2
spack concretize
spack install --dirty -v
Expand All @@ -55,11 +55,12 @@ jobs:
source spack/share/spack/setup-env.sh
spack env activate ww3-gnu
export WWATCH3_DIR=${GITHUB_WORKSPACE}/ww3/model
export OASIS_INPUT_PATH=${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.14/input/oasis3-mct
export OASIS_WORK_PATH=${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.14/input/work_oasis3-mct
cd ww3/regtests/ww3_tp2.14/input/oasis3-mct/util/make_dir
mkdir build && cd build
cmake ..
cmake .
make VERBOSE=1
cp -r ${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.14/work_oasis3-mct ${GITHUB_WORKSPACE}
cp -r ${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.14/input/work_oasis3-mct ${GITHUB_WORKSPACE}
Copy link
Copy Markdown
Collaborator

@mickaelaccensi mickaelaccensi Mar 11, 2022

Choose a reason for hiding this comment

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

why have you added the input directory here ?

Copy link
Copy Markdown
Contributor Author

@kgerheiser kgerheiser Mar 11, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Do I have it wrong? That's the location of work_oasis3-mct. I copy the work directory, which contains the built libraries to the top-level GITHUB_WORKSPACE and then cache it for future runs so it's not built during each run of the workflow.

      - name: cache-env
        id: cache-env
        uses: actions/cache@v2
        with:
          path: |
            spack
            ~/.spack
------> work_oasis3-mct
          key: spack-${{ runner.os }}-${{ env.cache_key }}


build:
needs: setup
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/intel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ defaults:

# Set I_MPI_CC/F90 so Intel MPI wrapper uses icc/ifort instead of gcc/gfortran
env:
cache_key: intel4
cache_key: intel5
CC: icc
FC: ifort
CXX: icpc
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
spack env create ww3-intel ww3/model/ci/spack.yaml
spack env activate ww3-intel
spack compiler find
spack external find m4 cmake pkgconf openssl
spack external find
spack add intel-oneapi-mpi
spack concretize
spack install --dirty -v
Expand All @@ -75,11 +75,12 @@ jobs:
source spack/share/spack/setup-env.sh
spack env activate ww3-intel
export WWATCH3_DIR=${GITHUB_WORKSPACE}/ww3/model
export OASIS_INPUT_PATH=${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.14/input/oasis3-mct
export OASIS_WORK_PATH=${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.14/input/work_oasis3-mct
cd ww3/regtests/ww3_tp2.14/input/oasis3-mct/util/make_dir
mkdir build && cd build
cmake ..
cmake .
make
cp -r ${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.14/work_oasis3-mct ${GITHUB_WORKSPACE}
cp -r ${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.14/input/work_oasis3-mct ${GITHUB_WORKSPACE}

build:
needs: setup
Expand Down
2 changes: 1 addition & 1 deletion ...ut/oasis3-mct/util/make_dir/make.inc.tmpl → ...4/input/oasis3-mct/util/make_dir/make.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
# Note: Choose one of these includes files and modify it according to your
# local settings. Replace the currently active file with your own.
#
include <oasis_input_path>/util/make_dir/cmplr
include $(OASIS_INPUT_PATH)/util/make_dir/cmplr
#
### End User configurable options ###
2 changes: 1 addition & 1 deletion regtests/ww3_tp2.14/input/toy/Makefile.tmpl → regtests/ww3_tp2.14/input/toy/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
include <oasis_input_path>/util/make_dir/make.inc
include $(OASIS_INPUT_PATH)/util/make_dir/make.inc
#
LIBPSMILE = $(ARCHDIR)/lib/libpsmile.${CHAN}.a $(ARCHDIR)/lib/libmct.a $(ARCHDIR)/lib/libmpeu.a $(ARCHDIR)/lib/libscrip.a
#
Expand Down
3 changes: 0 additions & 3 deletions regtests/ww3_tp2.14/input_oasacm/prep_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ echo ' Setup oasis cmplr file'
cd $path_w/oasis3-mct/util/make_dir

echo ' setup oasis make.inc file'
sed -e "s:<oasis_input_path>:$path_w/oasis3-mct:" make.inc.tmpl > make.inc

echo ' compile oasis coupler'
# Build OASIS with CMake wrapper
Expand All @@ -44,8 +43,6 @@ make

echo ' setup toy Makefile'
cd $path_w/toy
sed -e "s:<oasis_input_path>:$path_w/oasis3-mct:" Makefile.tmpl > Makefile


echo ' compile toy model'
make clean > $path_w/toy_clean.out
Expand Down
3 changes: 0 additions & 3 deletions regtests/ww3_tp2.14/input_oasacm2/prep_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ echo ' Setup oasis cmplr file'
cd $path_w/oasis3-mct/util/make_dir

echo ' setup oasis make.inc file'
sed -e "s:<oasis_input_path>:$path_w/oasis3-mct:" make.inc.tmpl > make.inc

echo ' compile oasis coupler'
# Build OASIS with CMake wrapper
Expand All @@ -44,8 +43,6 @@ make

echo ' setup toy Makefile'
cd $path_w/toy
sed -e "s:<oasis_input_path>:$path_w/oasis3-mct:" Makefile.tmpl > Makefile


echo ' compile toy model'
make clean > $path_w/toy_clean.out
Expand Down
3 changes: 0 additions & 3 deletions regtests/ww3_tp2.14/input_oasacm4/prep_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ echo ' Setup oasis cmplr file'
cd $path_w/oasis3-mct/util/make_dir

echo ' setup oasis make.inc file'
sed -e "s:<oasis_input_path>:$path_w/oasis3-mct:" make.inc.tmpl > make.inc

echo ' compile oasis coupler'
# Build OASIS with CMake wrapper
Expand All @@ -44,8 +43,6 @@ make

echo ' setup toy Makefile'
cd $path_w/toy
sed -e "s:<oasis_input_path>:$path_w/oasis3-mct:" Makefile.tmpl > Makefile


echo ' compile toy model'
make clean > $path_w/toy_clean.out
Expand Down
3 changes: 0 additions & 3 deletions regtests/ww3_tp2.14/input_oasacm5/prep_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ echo ' Setup oasis cmplr file'
cd $path_w/oasis3-mct/util/make_dir

echo ' setup oasis make.inc file'
sed -e "s:<oasis_input_path>:$path_w/oasis3-mct:" make.inc.tmpl > make.inc

echo ' compile oasis coupler'
# Build OASIS with CMake wrapper
Expand All @@ -44,8 +43,6 @@ make

echo ' setup toy Makefile'
cd $path_w/toy
sed -e "s:<oasis_input_path>:$path_w/oasis3-mct:" Makefile.tmpl > Makefile


echo ' compile toy model'
make clean > $path_w/toy_clean.out
Expand Down
3 changes: 0 additions & 3 deletions regtests/ww3_tp2.14/input_oasacm6/prep_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ echo ' Setup oasis cmplr file'
cd $path_w/oasis3-mct/util/make_dir

echo ' setup oasis make.inc file'
sed -e "s:<oasis_input_path>:$path_w/oasis3-mct:" make.inc.tmpl > make.inc

echo ' compile oasis coupler'
# Build OASIS with CMake wrapper
Expand All @@ -44,8 +43,6 @@ make

echo ' setup toy Makefile'
cd $path_w/toy
sed -e "s:<oasis_input_path>:$path_w/oasis3-mct:" Makefile.tmpl > Makefile


echo ' compile toy model'
make clean > $path_w/toy_clean.out
Expand Down
3 changes: 0 additions & 3 deletions regtests/ww3_tp2.14/input_oasicm/prep_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ echo ' Setup oasis cmplr file'
cd $path_w/oasis3-mct/util/make_dir

echo ' setup oasis make.inc file'
sed -e "s:<oasis_input_path>:$path_w/oasis3-mct:" make.inc.tmpl > make.inc

echo ' compile oasis coupler'
# Build OASIS with CMake wrapper
Expand All @@ -44,8 +43,6 @@ make

echo ' setup toy Makefile'
cd $path_w/toy
sed -e "s:<oasis_input_path>:$path_w/oasis3-mct:" Makefile.tmpl > Makefile


echo ' compile toy model'
make clean > $path_w/toy_clean.out
Expand Down
3 changes: 0 additions & 3 deletions regtests/ww3_tp2.14/input_oasocm/prep_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ echo ' Setup oasis cmplr file'
cd $path_w/oasis3-mct/util/make_dir

echo ' setup oasis make.inc file'
sed -e "s:<oasis_input_path>:$path_w/oasis3-mct:" make.inc.tmpl > make.inc

echo ' compile oasis coupler'
# Build OASIS with CMake wrapper
Expand All @@ -44,8 +43,6 @@ make

echo ' setup toy Makefile'
cd $path_w/toy
sed -e "s:<oasis_input_path>:$path_w/oasis3-mct:" Makefile.tmpl > Makefile


echo ' compile toy model'
make clean > $path_w/toy_clean.out
Expand Down