From 9a236f87478a8579e24f77b94b49b2b58cd6cdec Mon Sep 17 00:00:00 2001 From: David Sisson Date: Thu, 14 Mar 2024 18:15:26 -0700 Subject: [PATCH 1/4] Add cmake version check to the workflow. --- .github/workflows/build_test.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 87a1fe14..9599d73b 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -35,10 +35,13 @@ jobs: with: submodules: recursive - name: Setup Ubuntu - run: ./scripts/setup-ubuntu.sh - - run: mkdir build + run: | + ./scripts/setup-ubuntu.sh + mkdir build - name: Run cmake - run: cmake -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Debug -DBUILD_TZ_LIB=ON + run: | + cmake --version + cmake -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Debug -DBUILD_TZ_LIB=ON - name: Build run: ninja -C build - name: Test From 4172578c1b41d41ed4b8e4e7b86eec25f980f011 Mon Sep 17 00:00:00 2001 From: David Sisson Date: Thu, 14 Mar 2024 19:16:50 -0700 Subject: [PATCH 2/4] Add timeout and retry to make the build hopefully more resilient. --- .github/workflows/build_test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 9599d73b..fa47dc45 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -45,4 +45,5 @@ jobs: - name: Build run: ninja -C build - name: Test - run: ctest --test-dir build --output-on-failure + run: ctest --test-dir build --output-on-failure --timeout 10 --repeat until-pass:5 + From 2ee89feb87ba1f2c8034df004ab8973d92bb2e88 Mon Sep 17 00:00:00 2001 From: David Sisson Date: Thu, 14 Mar 2024 19:41:55 -0700 Subject: [PATCH 3/4] Reduce the retries so we can see persistent issues more clearly. --- .github/workflows/build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index fa47dc45..c2107ddb 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -45,5 +45,5 @@ jobs: - name: Build run: ninja -C build - name: Test - run: ctest --test-dir build --output-on-failure --timeout 10 --repeat until-pass:5 + run: ctest --test-dir build --output-on-failure --timeout 10 --repeat until-pass:2 From adf84290bffb9624413a6d516f8eb82e9b3d7c48 Mon Sep 17 00:00:00 2001 From: David Sisson Date: Thu, 14 Mar 2024 20:31:25 -0700 Subject: [PATCH 4/4] Turn off address sanitization by default. We should add a separate build later to test without affecting the runtime anyway. --- .github/workflows/build_test.yml | 2 +- CMakeLists.txt | 2 +- export/planloader/CMakeLists.txt | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index c2107ddb..e69559ea 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -45,5 +45,5 @@ jobs: - name: Build run: ninja -C build - name: Test - run: ctest --test-dir build --output-on-failure --timeout 10 --repeat until-pass:2 + run: ctest --test-dir build --output-on-failure --timeout 30 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c977ce3..025d6c22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) option(SUBSTRAIT_CPP_SANITIZE_DEBUG_BUILD "Turns on address and undefined memory sanitization runtime checking." - ON) + OFF) if(${SUBSTRAIT_CPP_SANITIZE_DEBUG_BUILD}) add_compile_options($<$:-fsanitize=undefined>) diff --git a/export/planloader/CMakeLists.txt b/export/planloader/CMakeLists.txt index 2294572c..e33353a9 100644 --- a/export/planloader/CMakeLists.txt +++ b/export/planloader/CMakeLists.txt @@ -1,12 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -if(CMAKE_BUILD_TYPE MATCHES Debug) - message( - WARNING - "The planloader library does not work well in Debug mode due to bundled heap checking." - ) -endif() - add_library(planloader SHARED planloader.cpp) add_dependencies(planloader substrait_io)