Fix review comments

Signed-off-by: Aleksandr Ivanov <[email protected]>

.github/workflows/sanitize.yaml

@@ -1,8 +1,10 @@
 name: Sanitize
 
 on:
-  pull_request_review:
-    types: [submitted]
+  # pull_request_review:
+  #   types: [submitted]
+  branches:
+    - sanitizers-in-docker
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -16,12 +18,13 @@ jobs:
         mode: ["asan", "msan", "tsan", "ubsan"]
       fail-fast: false
     runs-on: ubuntu-24.04
-    if: github.event.review.state == 'APPROVED'
+    # if: github.event.review.state == 'APPROVED'
     steps:
       - uses: actions/checkout@v4
-      - name : Strip ubuntu-24.04 to avoid space quota exceeding
+      - name : Purge runner
+      # Strip the runner to avoid space quota exceeding
         run: |
-          sudo apt-get purge \
+          sudo apt-get purge -y \
           azure-cli microsoft-edge-stable google-cloud-cli \
           google-chrome-stable temurin-21-jdk temurin-17-jdk \
           temurin-11-jdk dotnet-sdk-8.0 firefox temurin-8-jdk \

docker/build_deps.sh

@@ -2,16 +2,16 @@
 
 # This script downloads, builds, and installs the required build dependencies of BMQ
 # from github.com/bloomberg. Software packages are installed to the /opt/bb prefix.
-# If the optional argument 'only-download' is provided, the script will only download
-# dependencies, build and install steps are skipped.
+# If the optional argument '--only-download' is provided, the script will only download
+# dependencies (build and install steps are skipped).
 
 set -euxo pipefail
 
 if [ $# == 1 ]; then
-  if [[ $1 == "only-download" ]]; then
+  if [[ $1 == "--only-download" ]]; then
     DO_BUILD=false
   else
-     echo "Unexpected optional argument, only 'only-download' is supported"
+     echo "Unexpected optional argument, only '--only-download' is supported"
      exit 1
   fi
 else

docker/sanitizers/Dockerfile

@@ -17,8 +17,6 @@ COPY src src
 COPY CMakeLists.txt ./
 
 # Build with sanitizer instrumentation
-RUN chmod +x docker/build_deps.sh
-RUN chmod +x docker/sanitizers/build_sanitizer.sh
 RUN docker/sanitizers/build_sanitizer.sh ${SANITIZER_NAME}
 
 # Run unit tests

docker/sanitizers/README.md

@@ -1,5 +1,5 @@
 # Purpose
-This folder contains scripts to run BlazingMQ and it dependencies under sanitizer (asan, msan, tsan and ubsan) in Docker container.
+This folder contains scripts to run BlazingMQ and its dependencies under sanitizer (asan, msan, tsan and ubsan) in Docker container.
 
 Usually sanitizers check is done on CI, but using Docker it is possible to run sanitizers check in both CI and local environment.
 

docker/sanitizers/build_sanitizer.sh

@@ -123,7 +123,7 @@ checkoutGitRepo "$(github_url madler/zlib)" "${ZLIB_TAG}" "zlib"
 
 # Download bde-tools, bde and ntf-core sources
 cd "${DIR_EXTERNAL}"
-"${DIR_ROOT}"/docker/build_deps.sh "only-download"
+"${DIR_ROOT}"/docker/build_deps.sh "--only-download"
 cd -
 
 # Build libc++ with required instrumentation