Skip to content

Commit bdf84c9

Browse files
yatharthagoenkacameel
authored andcommitted
Ci: parameterize the clang sanitizer jobs
1 parent bce5f9e commit bdf84c9

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

.circleci/config.yml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,15 @@ defaults:
604604
nodejs_version: '14'
605605
resource_class: medium
606606

607+
- job_b_ubu_asan_clang: &job_b_ubu_asan_clang
608+
<<: *workflow_trigger_on_tags
609+
name: b_ubu_asan_clang
610+
cmake_options: -DSANITIZE=address
611+
- job_b_ubu_ubsan_clang: &job_b_ubu_ubsan_clang
612+
<<: *workflow_trigger_on_tags
613+
name: b_ubu_ubsan_clang
614+
cmake_options: -DSANITIZE=address
615+
607616
# -----------------------------------------------------------------------------------------------
608617
jobs:
609618

@@ -770,24 +779,18 @@ jobs:
770779
MAKEFLAGS: -j 10
771780
<<: *steps_build
772781

773-
b_ubu_asan_clang: &b_ubu_asan_clang
774-
# This runs a bit faster on large and xlarge but on nightly efficiency matters more.
775-
<<: *base_ubuntu2004_clang
776-
environment:
777-
CC: clang
778-
CXX: clang++
779-
CMAKE_OPTIONS: -DSANITIZE=address
780-
MAKEFLAGS: -j 3
781-
<<: *steps_build
782-
783-
b_ubu_ubsan_clang: &b_ubu_ubsan_clang
782+
b_ubu_san_clang:
784783
# This runs a bit faster on large and xlarge but on nightly efficiency matters more.
784+
parameters:
785+
cmake_options:
786+
type: string
785787
<<: *base_ubuntu2004_clang
786788
environment:
789+
TERM: xterm
787790
CC: clang
788791
CXX: clang++
789-
CMAKE_OPTIONS: -DSANITIZE=undefined
790792
MAKEFLAGS: -j 3
793+
CMAKE_OPTIONS: << parameters.cmake_options >>
791794
<<: *steps_build
792795

793796
b_ubu_release: &b_ubu_release
@@ -1506,13 +1509,13 @@ workflows:
15061509

15071510
# ASan build and tests
15081511
- b_ubu_asan: *workflow_trigger_on_tags
1509-
- b_ubu_asan_clang: *workflow_trigger_on_tags
1512+
- b_ubu_san_clang: *job_b_ubu_asan_clang
15101513
- t_ubu_asan_soltest: *workflow_ubuntu2004_asan
15111514
- t_ubu_asan_clang_soltest: *workflow_ubuntu2004_asan_clang
15121515
- t_ubu_asan_cli: *workflow_ubuntu2004_asan
15131516

15141517
# UBSan build and tests
1515-
- b_ubu_ubsan_clang: *workflow_trigger_on_tags
1518+
- b_ubu_san_clang: *job_b_ubu_ubsan_clang
15161519
- t_ubu_ubsan_clang_soltest: *workflow_ubuntu2004_ubsan_clang
15171520
- t_ubu_ubsan_clang_cli: *workflow_ubuntu2004_ubsan_clang
15181521

0 commit comments

Comments
 (0)