Skip to content

Commit d732625

Browse files
committed
[CI] Fix ASan option in basic workflow
1 parent c1c55b6 commit d732625

File tree

1 file changed

+15
-18
lines changed

1 file changed

+15
-18
lines changed

.github/workflows/basic.yml

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
pool_tracking: ['ON', 'OFF']
1818
shared_library: ['OFF']
1919
os_provider: ['ON']
20-
sanitizers: [{asan: 'OFF', ubsan: 'OFF', tsan: 'OFF'}]
20+
sanitizers: [{asan: OFF, ubsan: OFF, tsan: OFF}]
2121
include:
2222
- os: 'ubuntu-20.04'
2323
build_type: Release
@@ -53,13 +53,25 @@ jobs:
5353
pool_tracking: 'OFF'
5454
shared_library: 'OFF'
5555
# TSAN is mutually exclusive with other sanitizers
56-
sanitizers: [{asan: 'ON', ubsan: 'ON', tsan: 'OFF'}, {asan: 'OFF', ubsan: 'OFF', tsan: 'ON'}]
56+
sanitizers: {asan: ON, ubsan: ON, tsan: OFF}
57+
- os: 'ubuntu-22.04'
58+
build_type: Debug
59+
compiler: {c: clang, cxx: clang++}
60+
pool_tracking: 'OFF'
61+
shared_library: 'OFF'
62+
sanitizers: {asan: OFF, ubsan: OFF, tsan: ON}
5763
- os: 'ubuntu-22.04'
5864
build_type: Debug
5965
compiler: {c: gcc, cxx: g++}
6066
pool_tracking: 'OFF'
6167
shared_library: 'OFF'
62-
sanitizers: [{asan: 'ON', ubsan: 'ON', tsan: 'OFF'}, {asan: 'OFF', ubsan: 'OFF', tsan: 'ON'}]
68+
sanitizers: {asan: ON, ubsan: ON, tsan: OFF}
69+
- os: 'ubuntu-22.04'
70+
build_type: Debug
71+
compiler: {c: gcc, cxx: g++}
72+
pool_tracking: 'OFF'
73+
shared_library: 'OFF'
74+
sanitizers: {asan: OFF, ubsan: OFF, tsan: ON}
6375
runs-on: ${{matrix.os}}
6476

6577
steps:
@@ -123,8 +135,6 @@ jobs:
123135
compiler: [{c: cl, cxx: cl}]
124136
pool_tracking: ['ON', 'OFF']
125137
shared_library: ['OFF']
126-
# ASAN is the only available sanitizer on Windows
127-
sanitizers: [{asan: 'OFF'}]
128138
include:
129139
- os: 'windows-2022'
130140
build_type: Release
@@ -136,18 +146,6 @@ jobs:
136146
compiler: {c: cl, cxx: cl}
137147
pool_tracking: 'ON'
138148
shared_library: 'ON'
139-
- os: 'windows-2022'
140-
build_type: Debug
141-
compiler: {c: clang-cl, cxx: clang-cl}
142-
pool_tracking: 'OFF'
143-
shared_library: 'OFF'
144-
sanitizers: [{asan: 'ON'}]
145-
- os: 'windows-2022'
146-
build_type: Debug
147-
compiler: {c: cl, cxx: cl}
148-
pool_tracking: 'OFF'
149-
shared_library: 'OFF'
150-
sanitizers: [{asan: 'ON'}]
151149

152150
runs-on: ${{matrix.os}}
153151

@@ -166,7 +164,6 @@ jobs:
166164
-DUMF_FORMAT_CODE_STYLE=OFF
167165
-DUMF_DEVELOPER_MODE=ON
168166
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
169-
-DUSE_ASAN=${{matrix.sanitizers.asan}}
170167
171168
- name: Build UMF
172169
run: cmake --build ${{env.BUILD_DIR}} --config ${{matrix.build_type}} -j $Env:NUMBER_OF_PROCESSORS

0 commit comments

Comments
 (0)