@@ -62,59 +62,65 @@ commands:
6262 compiler :
6363 type : string
6464 steps :
65- - name : " Versions, etc."
66- - run : mpirun --version && << parameters.compiler >> --version && echo $BASEDIR && pwd && ls && echo "$(nproc)"
65+ - run :
66+ name : " Versions, etc."
67+ command : |
68+ mpirun --version && << parameters.compiler >> --version && echo $BASEDIR && pwd && ls && echo "$(nproc)"
6769
6870 checkout_fixture :
6971 description : " Checkout fixture"
7072 parameters :
7173 repo :
7274 type : string
7375 steps :
74- - name : " Checkout fixture"
75- - run : |
76- cd ${CIRCLE_WORKING_DIRECTORY}
77- git clone https://github.com/GEOS-ESM/<< parameters.repo >>.git
76+ - run :
77+ name : " Checkout fixture"
78+ command : |
79+ cd ${CIRCLE_WORKING_DIRECTORY}
80+ git clone https://github.com/GEOS-ESM/<< parameters.repo >>.git
7881
7982 mepoclone :
8083 description : " Mepo clone external repos"
8184 parameters :
8285 repo :
8386 type : string
8487 steps :
85- - name : " Mepo clone external repos"
86- - run : |
87- cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
88- mepo clone
89- mepo status
88+ - run :
89+ name : " Mepo clone external repos"
90+ command : |
91+ cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
92+ mepo clone
93+ mepo status
9094
9195 mepodevelop :
9296 description : " Mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared"
9397 parameters :
9498 repo :
9599 type : string
96100 steps :
97- - name : " Mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared"
98- - run : |
99- cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
100- mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared
101- mepo status
101+ - run :
102+ name : " Mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared"
103+ command : |
104+ cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
105+ mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared
106+ mepo status
102107
103108 checkout_feature_branch :
104109 description : " Mepo checkout-if-exists feature branch"
105110 parameters :
106111 repo :
107112 type : string
108113 steps :
109- - name : " Mepo checkout-if-exists feature branch"
110- - run : |
111- cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
112- echo "${CIRCLE_BRANCH}"
113- if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "main" ]
114- then
115- mepo checkout-if-exists ${CIRCLE_BRANCH}
116- fi
117- mepo status
114+ - run :
115+ name : " Mepo checkout-if-exists feature branch"
116+ command : |
117+ cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
118+ echo "${CIRCLE_BRANCH}"
119+ if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "main" ]
120+ then
121+ mepo checkout-if-exists ${CIRCLE_BRANCH}
122+ fi
123+ mepo status
118124
119125 cmake :
120126 description : " Run CMake"
@@ -124,25 +130,27 @@ commands:
124130 compiler :
125131 type : string
126132 steps :
127- - name : " Run CMake"
128- - run : |
129- mkdir -p /logfiles
130- cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
131- mkdir -p ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
132- cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
133- cmake ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >> -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=<< parameters.compiler >> -DCMAKE_BUILD_TYPE=Debug -DUSE_F2PY=OFF -DMPIEXEC_PREFLAGS=${MPIEXEC_PREFLAGS} -DCMAKE_INSTALL_PREFIX=${CIRCLE_WORKING_DIRECTORY}/workspace/install-<< parameters.repo >> |& tee /logfiles/cmake.log
133+ - run :
134+ name : " Run CMake"
135+ command : |
136+ mkdir -p /logfiles
137+ cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
138+ mkdir -p ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
139+ cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
140+ cmake ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >> -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=<< parameters.compiler >> -DCMAKE_BUILD_TYPE=Debug -DUSE_F2PY=OFF -DMPIEXEC_PREFLAGS=${MPIEXEC_PREFLAGS} -DCMAKE_INSTALL_PREFIX=${CIRCLE_WORKING_DIRECTORY}/workspace/install-<< parameters.repo >> |& tee /logfiles/cmake.log
134141
135142 buildinstall :
136143 description : " Build and install"
137144 parameters :
138145 repo :
139146 type : string
140147 steps :
141- - name : " Build and install"
142- - run : |
143- cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
144- make -j"$(nproc)" install |& tee /logfiles/make.log
145- #MEDIUM# make -j4 install |& tee /logfiles/make.log
148+ - run :
149+ name : " Build and install"
150+ command : |
151+ cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
152+ make -j"$(nproc)" install |& tee /logfiles/make.log
153+ #MEDIUM# make -j4 install |& tee /logfiles/make.log
146154
147155jobs :
148156 build-GEOSgcm :
0 commit comments