7373 INSTALL_DIR : install
7474 OASIS_TAG : tsmp-patches-v0.1
7575 OASIS_INSTALL_PREFIX : ${{ github.workspace }}/oasis3-mct/install
76- PFUNIT_TAG : v4.10 .0
76+ PFUNIT_TAG : v4.12 .0
7777 PFUNIT_INSTALL_PREFIX : ${{ github.workspace }}/pFUnit/install
7878
7979 steps :
@@ -108,6 +108,7 @@ jobs:
108108 cd util/make_dir
109109 echo "include ${GITHUB_WORKSPACE}/.github/build.oasis3-mct.ubuntu22.04" > make.inc
110110 make realclean static-libs -f TopMakefileOasis3
111+ echo "CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:${OASIS_INSTALL_PREFIX}" >> $GITHUB_ENV
111112
112113 - if : matrix.config.use_oasis == 'True' && steps.cache-oasis-restore.outputs.cache-hit != 'true'
113114 name : Cache OASIS3-MCT ${{ env.OASIS_TAG }}
@@ -116,10 +117,6 @@ jobs:
116117 path : ${{ env.OASIS_INSTALL_PREFIX }}
117118 key : cache-${{ matrix.config.name }}-${{ env.OASIS_TAG }}
118119
119- - if : matrix.config.use_oasis == 'True'
120- name : Add OASIS to CMAKE_PREFIX_PATH
121- run : |
122- echo "CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:${OASIS_INSTALL_PREFIX}" >> $GITHUB_ENV
123120 #
124121 # pFUnit
125122 #
@@ -139,6 +136,7 @@ jobs:
139136 cmake -S . -B bld -DCMAKE_INSTALL_PREFIX=install
140137 cmake --build bld
141138 cmake --install bld
139+ echo "CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:${PFUNIT_INSTALL_PREFIX}" >> $GITHUB_ENV
142140
143141 - if : steps.cache-pFUnit-restore.outputs.cache-hit != 'true'
144142 name : Cache pFUnit ${{ env.PFUNIT_TAG }}
@@ -147,10 +145,6 @@ jobs:
147145 path : ${{ env.PFUNIT_INSTALL_PREFIX }}
148146 key : cache-${{ matrix.config.name }}-${{ env.PFUNIT_TAG }}
149147
150- - name : Add pFUnit to CMAKE_PREFIX_PATH
151- run : |
152- echo "CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:${PFUNIT_INSTALL_PREFIX}" >> $GITHUB_ENV
153-
154148 #
155149 # Configure, build, and install eCLM
156150 #
@@ -166,6 +160,7 @@ jobs:
166160 -DCOUP_OAS_ICON=${{ matrix.config.coup_oas_icon }} \
167161 -DCOUP_OAS_PFL=${{ matrix.config.coup_oas_pfl }} \
168162 -DUSE_PDAF=${{ matrix.config.use_pdaf }}
163+ -DENABLE_TESTS="True"
169164
170165 - name : Build eCLM
171166 run : cmake --build $BUILD_DIR
0 commit comments