diff --git a/.github/actions/build-deps/action.yml b/.github/actions/build-deps/action.yml index 5141a86416..843e6bdad5 100644 --- a/.github/actions/build-deps/action.yml +++ b/.github/actions/build-deps/action.yml @@ -21,10 +21,6 @@ inputs: description: "The logging verbosity." required: false default: "verbose" - sanitizers: - description: "The sanitizers to enable ('Address+UndefinedBehaviour' or 'Thread+UndefinedBehaviour')." - required: false - default: "" runs: using: composite @@ -39,10 +35,6 @@ runs: LOG_VERBOSITY: ${{ inputs.log_verbosity }} run: | echo 'Installing dependencies.' - echo 'github.workspace === ${{ github.workspace }}' - echo "GITHUB_WORKSPACE === $GITHUB_WORKSPACE" - echo 'runner.workspace === ${{ runner.workspace }}' - echo "RUNNER_WORKSPACE === $RUNNER_WORKSPACE" mkdir -p "${BUILD_DIR}" cd "${BUILD_DIR}" conan install \ diff --git a/.github/scripts/strategy-matrix/generate.py b/.github/scripts/strategy-matrix/generate.py index f6e4a863ca..dcdf911c55 100755 --- a/.github/scripts/strategy-matrix/generate.py +++ b/.github/scripts/strategy-matrix/generate.py @@ -179,8 +179,8 @@ def generate_strategy_matrix(all: bool, config: Config) -> list: # Disable mold linker - it's too strict about relocations with GCC runtime libs # Use default linker (bfd/ld) which is more lenient with mixed code models cmake_args += ' -Duse_mold=OFF -Duse_gold=OFF -Duse_lld=OFF' - #exe_linker_flags += ' -fuse-ld=lld'# -static-libubsan -static-libasan -static-libtsan' - #shared_linker_flags += ' -fuse-ld=lld'# -static-libubsan -static-libasan -static-libtsan' + exe_linker_flags += ' -static-libubsan -static-libasan -static-libtsan' + shared_linker_flags += ' -static-libubsan -static-libasan -static-libtsan' if architecture['platform'] == 'linux/amd64' and os['compiler_name'] == 'gcc': # Add -mcmodel=large and -fPIC to both compiler AND linker flags @@ -210,8 +210,7 @@ def generate_strategy_matrix(all: bool, config: Config) -> list: 'build_only': build_only, 'build_type': build_type, 'os': os, - 'architecture': architecture, - 'sanitizers': "Address" + 'architecture': architecture }) # Update configs for tsan # gcc doesn't supports atomic_thread_fence with tsan. Suppress warnings. @@ -236,8 +235,7 @@ def generate_strategy_matrix(all: bool, config: Config) -> list: 'build_only': build_only, 'build_type': build_type, 'os': os, - 'architecture': architecture, - 'sanitizers': "Thread" + 'architecture': architecture }) else: if cxx_flags: @@ -251,8 +249,7 @@ def generate_strategy_matrix(all: bool, config: Config) -> list: 'build_only': build_only, 'build_type': build_type, 'os': os, - 'architecture': architecture, - 'sanitizers': "" + 'architecture': architecture }) return configurations diff --git a/.github/workflows/on-trigger.yml b/.github/workflows/on-trigger.yml index 90ca4f3ae2..9df6417c07 100644 --- a/.github/workflows/on-trigger.yml +++ b/.github/workflows/on-trigger.yml @@ -75,7 +75,6 @@ jobs: os: [linux, macos, windows] with: os: ${{ matrix.os }} - sanitizers: ${{ matrix.sanitizers }} strategy_matrix: ${{ github.event_name == 'schedule' && 'all' || 'minimal' }} secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/reusable-build-test-config.yml b/.github/workflows/reusable-build-test-config.yml index a139dbbe12..a57d15275b 100644 --- a/.github/workflows/reusable-build-test-config.yml +++ b/.github/workflows/reusable-build-test-config.yml @@ -29,12 +29,6 @@ on: type: string required: true - sanitizers: - description: "The sanitizers to enable ('Address+UndefinedBehaviour' or 'Thread+UndefinedBehaviour')." - required: true - type: string - default: "" - runs_on: description: Runner to run the job on as a JSON string required: true @@ -105,7 +99,6 @@ jobs: build_dir: ${{ inputs.build_dir }} build_nproc: ${{ steps.nproc.outputs.nproc }} build_type: ${{ inputs.build_type }} - sanitizers: ${{ inputs.sanitizers }} # Set the verbosity to "quiet" for Windows to avoid an excessive # amount of logs. For other OSes, the "verbose" logs are more useful. log_verbosity: ${{ runner.os == 'Windows' && 'quiet' || 'verbose' }} @@ -146,7 +139,7 @@ jobs: if-no-files-found: error - name: Check linking (Linux) - if: ${{ runner.os == 'Linux' && inputs.sanitizers == '' }} + if: ${{ runner.os == 'Linux' }} working-directory: ${{ inputs.build_dir }} run: | ldd ./rippled diff --git a/BUILD.md b/BUILD.md index e2c72820b4..a2b4b7abfe 100644 --- a/BUILD.md +++ b/BUILD.md @@ -361,7 +361,7 @@ tools.build:cxxflags=['-DBOOST_ASIO_DISABLE_CONCEPTS'] ``` If you would like to activate `asan+ubsan`(`Address`) or `tsan+ubsan`(`Thread`) for the build, - declare an env. variable as follows and simply use the `incsanitizers` + declare an env. variable as follows and simply use the `sanitizers` profile in the `conan install` command. ```