Skip to content

Commit 6ab92ca

Browse files
godexsoftgodexsoft
authored
chore: Enable TSAN in CI (#2785)
1 parent 77387d8 commit 6ab92ca

File tree

12 files changed

+19
-25
lines changed

12 files changed

+19
-25
lines changed

‎.github/scripts/conan/generate_matrix.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
LINUX_OS = ["heavy", "heavy-arm64"]
66
LINUX_CONTAINERS = [
7-
'{ "image": "ghcr.io/xrplf/clio-ci:62369411404eb32b0140603a785ff05e1dc36ce8" }'
7+
'{ "image": "ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7" }'
88
]
99
LINUX_COMPILERS = ["gcc", "clang"]
1010

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
build_type: [Release, Debug]
5050
container:
5151
[
52-
'{ "image": "ghcr.io/xrplf/clio-ci:62369411404eb32b0140603a785ff05e1dc36ce8" }',
52+
'{ "image": "ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7" }',
5353
]
5454
static: [true]
5555

@@ -79,7 +79,7 @@ jobs:
7979
uses: ./.github/workflows/reusable-build.yml
8080
with:
8181
runs_on: heavy
82-
container: '{ "image": "ghcr.io/xrplf/clio-ci:62369411404eb32b0140603a785ff05e1dc36ce8" }'
82+
container: '{ "image": "ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7" }'
8383
conan_profile: gcc
8484
build_type: Debug
8585
download_ccache: true
@@ -98,7 +98,7 @@ jobs:
9898
uses: ./.github/workflows/reusable-build.yml
9999
with:
100100
runs_on: heavy
101-
container: '{ "image": "ghcr.io/xrplf/clio-ci:62369411404eb32b0140603a785ff05e1dc36ce8" }'
101+
container: '{ "image": "ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7" }'
102102
conan_profile: gcc
103103
build_type: Release
104104
download_ccache: true
@@ -115,7 +115,7 @@ jobs:
115115
needs: build-and-test
116116
runs-on: heavy
117117
container:
118-
image: ghcr.io/xrplf/clio-ci:62369411404eb32b0140603a785ff05e1dc36ce8
118+
image: ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7
119119

120120
steps:
121121
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

‎.github/workflows/check-libxrpl.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
name: Build Clio / `libXRPL ${{ github.event.client_payload.version }}`
2222
runs-on: heavy
2323
container:
24-
image: ghcr.io/xrplf/clio-ci:62369411404eb32b0140603a785ff05e1dc36ce8
24+
image: ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7
2525

2626
steps:
2727
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -69,7 +69,7 @@ jobs:
6969
needs: build
7070
runs-on: heavy
7171
container:
72-
image: ghcr.io/xrplf/clio-ci:62369411404eb32b0140603a785ff05e1dc36ce8
72+
image: ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7
7373

7474
steps:
7575
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0

‎.github/workflows/clang-tidy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
if: github.event_name != 'push' || contains(github.event.head_commit.message, 'clang-tidy auto fixes')
3232
runs-on: heavy
3333
container:
34-
image: ghcr.io/xrplf/clio-ci:62369411404eb32b0140603a785ff05e1dc36ce8
34+
image: ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7
3535

3636
permissions:
3737
contents: write

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
build:
1919
runs-on: ubuntu-latest
2020
container:
21-
image: ghcr.io/xrplf/clio-ci:62369411404eb32b0140603a785ff05e1dc36ce8
21+
image: ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7
2222

2323
steps:
2424
- name: Checkout

‎.github/workflows/nightly.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ jobs:
4343
conan_profile: gcc
4444
build_type: Release
4545
static: true
46-
container: '{ "image": "ghcr.io/xrplf/clio-ci:62369411404eb32b0140603a785ff05e1dc36ce8" }'
46+
container: '{ "image": "ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7" }'
4747
- os: heavy
4848
conan_profile: gcc
4949
build_type: Debug
5050
static: true
51-
container: '{ "image": "ghcr.io/xrplf/clio-ci:62369411404eb32b0140603a785ff05e1dc36ce8" }'
51+
container: '{ "image": "ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7" }'
5252
- os: heavy
5353
conan_profile: gcc.ubsan
5454
build_type: Release
5555
static: false
56-
container: '{ "image": "ghcr.io/xrplf/clio-ci:62369411404eb32b0140603a785ff05e1dc36ce8" }'
56+
container: '{ "image": "ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7" }'
5757

5858
uses: ./.github/workflows/reusable-build-test.yml
5959
with:
@@ -77,7 +77,7 @@ jobs:
7777
include:
7878
- os: heavy
7979
conan_profile: clang
80-
container: '{ "image": "ghcr.io/xrplf/clio-ci:62369411404eb32b0140603a785ff05e1dc36ce8" }'
80+
container: '{ "image": "ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7" }'
8181
static: true
8282
- os: macos15
8383
conan_profile: apple-clang

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
conan_profile: gcc
3030
build_type: Release
3131
static: true
32-
container: '{ "image": "ghcr.io/xrplf/clio-ci:62369411404eb32b0140603a785ff05e1dc36ce8" }'
32+
container: '{ "image": "ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7" }'
3333

3434
uses: ./.github/workflows/reusable-build-test.yml
3535
with:

‎.github/workflows/reusable-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
release:
4747
runs-on: heavy
4848
container:
49-
image: ghcr.io/xrplf/clio-ci:62369411404eb32b0140603a785ff05e1dc36ce8
49+
image: ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7
5050
env:
5151
GH_REPO: ${{ github.repository }}
5252
GH_TOKEN: ${{ github.token }}

‎.github/workflows/sanitizers.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,13 @@ jobs:
4444
uses: ./.github/workflows/reusable-build-test.yml
4545
with:
4646
runs_on: heavy
47-
container: '{ "image": "ghcr.io/xrplf/clio-ci:62369411404eb32b0140603a785ff05e1dc36ce8" }'
47+
container: '{ "image": "ghcr.io/xrplf/clio-ci:77387d8f9f13aea8f23831d221ac3e7683bb69b7" }'
4848
download_ccache: false
4949
upload_ccache: false
5050
conan_profile: ${{ matrix.compiler }}${{ matrix.sanitizer_ext }}
5151
build_type: ${{ matrix.build_type }}
5252
static: false
53-
# Currently, both gcc.tsan and clang.tsan unit tests hang
54-
run_unit_tests: ${{ matrix.sanitizer_ext != '.tsan' }}
53+
run_unit_tests: true
5554
run_integration_tests: false
5655
upload_clio_server: false
5756
targets: clio_tests clio_integration_tests

‎CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,6 @@ if (san)
7575
endif ()
7676
target_compile_options(clio_options INTERFACE ${SAN_OPTIMIZATION_FLAG} ${SAN_FLAG} -fno-omit-frame-pointer)
7777

78-
if (san STREQUAL "address")
79-
# ASAN needs these definitions as well as correct b2 flags in conan profile for sanitizers
80-
target_compile_definitions(clio_options INTERFACE BOOST_USE_ASAN=1 BOOST_USE_UCONTEXT=1)
81-
endif ()
82-
8378
target_link_libraries(clio_options INTERFACE ${SAN_FLAG} ${SAN_LIB})
8479
endif ()
8580

0 commit comments

Comments
 (0)