ci: fix path to lsan suppressions, fix broken gh status post

ornladios · Dec 6, 2023 · 1e5993e · 1e5993e
1 parent d8a70b3
commit 1e5993e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,6 +2,10 @@ defaults: &defaults
   steps:
     - checkout:
         path: source
+    - run:
+        # https://discuss.circleci.com/t/circle-working-directory-doesnt-expand/17007
+        name: "Fix CIRCLE_WORKING_DIRECTORY"
+        command: echo 'CIRCLE_WORKING_DIRECTORY="${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}"' >> $BASH_ENV
     - run:
         name: CDash
         command: bash source/scripts/ci/circle/postCDashStatus.sh

diff --git a/scripts/ci/circle/postCDashStatus.sh b/scripts/ci/circle/postCDashStatus.sh
@@ -17,7 +17,7 @@ build_status_body() {
 EOF
 }
 
-PYTHON_SCRIPT="${SOURCE_DIR}/scripts/ci/findStatus.py"
+PYTHON_SCRIPT="${SOURCE_DIR}/scripts/ci/circle/findStatus.py"
 curl -u "${USER}:${TOKEN}" "${API_BASE}/commits/${COMMIT}/statuses" | python3 "${PYTHON_SCRIPT}" --context ${CDASH_STATUS_CONTEXT}
 exit_status=$?
 if [ "$exit_status" -ne 0 ]

diff --git a/scripts/ci/cmake/ci-fedora-asan.cmake b/scripts/ci/cmake/ci-fedora-asan.cmake
@@ -4,7 +4,7 @@ set(ENV{CC}  clang)
 set(ENV{CXX} clang++)
 set(ASAN_FLAGS "-fsanitize=address -fno-omit-frame-pointer -pthread -mllvm -asan-use-private-alias=1 -Wno-unused-command-line-argument")
 set(ENV{ASAN_OPTIONS} "use_odr_indicator=1")
-set(ENV{LSAN_OPTIONS} "suppressions=${CMAKE_SOURCE_DIR}/thirdparty/perfstubs/perfstubs.supp")
+set(ENV{LSAN_OPTIONS} "suppressions=$ENV{CI_SOURCE_DIR}/thirdparty/perfstubs/perfstubs.supp")
 set(ENV{CFLAGS}   "${ASAN_FLAGS}")
 set(ENV{CXXFLAGS} "${ASAN_FLAGS}")