Skip to content

Commit 7c50167

Browse files
committed
Set CMAKE_PREFIX_PATH on a separate job step
1 parent 99e6699 commit 7c50167

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

.github/workflows/CI.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ 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
112111
113112
- if: matrix.config.use_oasis == 'True' && steps.cache-oasis-restore.outputs.cache-hit != 'true'
114113
name: Cache OASIS3-MCT ${{ env.OASIS_TAG }}
@@ -117,6 +116,11 @@ jobs:
117116
path: ${{ env.OASIS_INSTALL_PREFIX }}
118117
key: cache-${{ matrix.config.name }}-${{ env.OASIS_TAG }}
119118

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
123+
120124
#
121125
# pFUnit
122126
#
@@ -145,6 +149,10 @@ jobs:
145149
path: ${{ env.PFUNIT_INSTALL_PREFIX }}
146150
key: cache-${{ matrix.config.name }}-${{ env.PFUNIT_TAG }}
147151

152+
- name: Add pFUnit to CMAKE_PREFIX_PATH
153+
run: |
154+
echo "CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:${PFUNIT_INSTALL_PREFIX}" >> $GITHUB_ENV
155+
148156
#
149157
# Configure, build, and install eCLM
150158
#

0 commit comments

Comments
 (0)