Skip to content

Commit 056d164

Browse files
committed
Merge branch 'jk/ci-use-clang-for-sanitizer-jobs'
Clang's sanitizer implementation seems to work better than GCC's. * jk/ci-use-clang-for-sanitizer-jobs: ci: drop linux-clang job ci: run ASan/UBSan in a single job ci: use clang for ASan/UBSan checks
2 parents ae19633 + d88d727 commit 056d164

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,6 @@ jobs:
246246
fail-fast: false
247247
matrix:
248248
vector:
249-
- jobname: linux-clang
250-
cc: clang
251-
pool: ubuntu-latest
252249
- jobname: linux-sha256
253250
cc: clang
254251
pool: ubuntu-latest
@@ -273,11 +270,8 @@ jobs:
273270
- jobname: linux-leaks
274271
cc: gcc
275272
pool: ubuntu-latest
276-
- jobname: linux-asan
277-
cc: gcc
278-
pool: ubuntu-latest
279-
- jobname: linux-ubsan
280-
cc: gcc
273+
- jobname: linux-asan-ubsan
274+
cc: clang
281275
pool: ubuntu-latest
282276
env:
283277
CC: ${{matrix.vector.cc}}

ci/lib.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,11 +278,8 @@ linux-leaks)
278278
export GIT_TEST_PASSING_SANITIZE_LEAK=true
279279
export GIT_TEST_SANITIZE_LEAK_LOG=true
280280
;;
281-
linux-asan)
282-
export SANITIZE=address
283-
;;
284-
linux-ubsan)
285-
export SANITIZE=undefined
281+
linux-asan-ubsan)
282+
export SANITIZE=address,undefined
286283
;;
287284
esac
288285

0 commit comments

Comments
 (0)