Skip to content

Commit be565c6

Browse files
authored
Merge pull request #748 from GEOS-ESM/bugfix/v12-ci-fix
2 parents 57a4882 + 5ddc2c1 commit be565c6

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/spack-ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
fetch-depth: 1
2929
filter: blob:none
3030
repository: GEOS-ESM/GEOSgcm
31+
ref: feature/sdrabenh/gcm_v12
3132

3233
- name: Set all directories as git safe
3334
run: |
@@ -108,14 +109,14 @@ jobs:
108109
run: |
109110
spack clean -m
110111
spack -e spack-env install --add --no-check-signature --use-buildcache only \
111-
esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas
112+
esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas fms
112113
113114
- name: Build with Cmake
114115
shell: spack-bash {0}
115116
run: |
116117
spack env activate spack-env
117118
spack load \
118-
esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas
119+
esmf gftl gftl-shared fargparse pflogger pfunit yafyaml ecbuild udunits openblas fms
119120
spack find --loaded
120121
FC=gfortran-14 CC=gcc-14 CXX=g++-14
121122
cmake -B build -S . -DCMAKE_INSTALL_PREFIX=$PWD/install -DCMAKE_BUILD_TYPE=Debug -DUSE_F2PY=OFF -DCMAKE_Fortran_COMPILER=${FC} -DCMAKE_C_COMPILER=${CC} -DCMAKE_CXX_COMPILER=${CXX}

.github/workflows/workflow.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
fetch-depth: 1
4646
filter: blob:none
4747
repository: GEOS-ESM/GEOSgcm
48+
ref: feature/sdrabenh/gcm_v12
4849

4950
- name: Set all directories as git safe
5051
run: |

0 commit comments

Comments
 (0)