Commit b7ad980 1 parent a4ddee4 commit b7ad980 Copy full SHA for b7ad980
File tree 1 file changed +7
-4
lines changed
1 file changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -224,9 +224,6 @@ jobs:
224
224
OS_APP_VERSION=$(cat version.txt)
225
225
echo OS_APP_VERSION=$OS_APP_VERSION >> $GITHUB_ENV
226
226
227
- CONAN_INSTALL_MD5=$(md5sum ConanInstall.cmake | awk '{print $1}')
228
- echo CONAN_INSTALL_MD5=$CONAN_INSTALL_MD5 >> $GITHUB_ENV
229
-
230
227
echo PLATFORM_NAME=${{ matrix.PLATFORM_NAME }} >> $GITHUB_ENV
231
228
echo CPACK_BINARY_DEB=${{ matrix.CPACK_BINARY_DEB }} >> $GITHUB_ENV
232
229
echo CPACK_BINARY_IFW=${{ matrix.CPACK_BINARY_IFW }} >> $GITHUB_ENV
@@ -264,6 +261,9 @@ jobs:
264
261
echo "~/Qt/QtIFW-3.2.2/bin/" >> $GITHUB_PATH
265
262
fi;
266
263
264
+ CONAN_INSTALL_MD5=$(md5sum ConanInstall.cmake | awk '{print $1}')
265
+ echo CONAN_INSTALL_MD5=$CONAN_INSTALL_MD5 >> $GITHUB_ENV
266
+
267
267
# TODO: cache the QtIFW folder too
268
268
269
269
- name : Cache entire build directory
@@ -357,7 +357,9 @@ jobs:
357
357
id : cacheconan
358
358
uses : actions/cache@v2
359
359
with :
360
- path : ~/.conan
360
+ path : |
361
+ ~/.conan
362
+ /.conan
361
363
key : ${{ matrix.os }}-conan-cache-${{ env.CONAN_INSTALL_MD5 }}
362
364
363
365
- name : Did restoring the conan-cache work? No
@@ -374,6 +376,7 @@ jobs:
374
376
run : |
375
377
ls ~/.conan/
376
378
ls ~/.conan/data/
379
+ ls /.conan
377
380
378
381
- name : Create Build Environment and locate openstudio
379
382
# Some projects don't allow in-source building, so create a separate build directory
You can’t perform that action at this time.
0 commit comments