Skip to content

Commit 6e8db5e

Browse files
committed
Update github actions for CPM
1 parent eeccfba commit 6e8db5e

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

.github/workflows/cmake.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ on:
1010

1111
env:
1212
BUILD_TYPE: RelWithDebInfo
13-
# Conan cache environment variables
14-
CONAN_SYSREQUIRES_MODE: enabled
15-
CONAN_USER_HOME: "${{ github.workspace }}/conan-cache"
16-
CONAN_USER_HOME_SHORT: "${{ github.workspace }}/conan-cache/short"
13+
# CPM cache environment variable
14+
CPM_SOURCE_CACHE: "${{ github.workspace }}/.cpm-cache"
1715

1816
jobs:
1917
build:
@@ -29,15 +27,11 @@ jobs:
2927
- name: Cache
3028
uses: actions/cache@v2
3129
env:
32-
cache-name: cache-conan-modules
30+
cache-name: cache-cpm-modules
3331
with:
3432
path: |
35-
${{ env.CONAN_USER_HOME }}
36-
~/.cache/pip
37-
key: ${{ runner.os }}-${{ env.BUILD_TYPE }}-${{ hashFiles('CMakeLists.txt') }}-${{ hashFiles('cmake/Conan.cmake') }}
38-
39-
- name: Get Conan
40-
uses: turtlebrowser/[email protected]
33+
${{ env.CPM_SOURCE_CACHE }}
34+
key: ${{ runner.os }}-${{ env.BUILD_TYPE }}-${{ hashFiles('CMakeLists.txt') }}-${{ hashFiles('cmake/CPM.cmake') }}
4135

4236
- name: Configure CMake
4337
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}

0 commit comments

Comments
 (0)