Skip to content

Commit 2193aef

Browse files
committed
fix(gha): don't force --clean on the conan-cache step
1 parent e12e9cc commit 2193aef

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

.github/workflows/tests.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ jobs:
3232
from: faabric
3333
- name: "Build Conan deps to be shared by all runs"
3434
run: |
35-
./bin/inv_wrapper.sh dev.conan --build Debug --clean
36-
./bin/inv_wrapper.sh dev.conan --build Release --clean
35+
./bin/inv_wrapper.sh dev.conan --build Debug
36+
./bin/inv_wrapper.sh dev.conan --build Release
3737
3838
docs:
3939
if: github.event.pull_request.draft == false
@@ -85,7 +85,7 @@ jobs:
8585
- name: "Ping redis"
8686
run: redis-cli -h redis ping
8787
- name: "Run conan"
88-
run: ./bin/inv_wrapper.sh dev.conan --clean --build=Debug
88+
run: ./bin/inv_wrapper.sh dev.conan --build=Debug
8989
- name: "Run cmake for tests"
9090
run: ./bin/inv_wrapper.sh dev.cmake --clean --build=Debug --coverage
9191
- name: "Build tests"
@@ -128,9 +128,15 @@ jobs:
128128
from: faabric
129129
- name: "Ping redis"
130130
run: redis-cli -h redis ping
131-
# Re-run conan with the --clean flag to rebuild the packages with sanitisers
132-
- name: "Run conan"
131+
# For sanitised builds, we need to also re-build all Conan dependencies
132+
# so that they are also sanitized. Otherwise this causes unexpected
133+
# crashes.
134+
- name: "Re-build conan deps"
135+
if: ${{ matrix.sanitiser != 'None' }}
133136
run: ./bin/inv_wrapper.sh dev.conan --clean --build=Debug --sanitiser ${{ matrix.sanitiser }}
137+
- name: "Run conan"
138+
if: ${{ matrix.sanitiser == 'None' }}
139+
run: ./bin/inv_wrapper.sh dev.conan --build=Debug --sanitiser ${{ matrix.sanitiser }}
134140
- name: "Run cmake for tests"
135141
run: ./bin/inv_wrapper.sh dev.cmake --clean --build=Debug --sanitiser ${{ matrix.sanitiser }}
136142
- name: "Build tests"

0 commit comments

Comments
 (0)