From 1c50487439fe5c6425064c174a00b915eebd1164 Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Wed, 1 Apr 2020 14:41:07 +0300 Subject: [PATCH 1/2] [CI][BuildBot] Fix configure parameter to turn on/off assertions Update post-commit checks to validate builds with and without assertions. Signed-off-by: Alexey Bader --- .github/workflows/linux_post_commit.yml | 4 ++-- buildbot/configure.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux_post_commit.yml b/.github/workflows/linux_post_commit.yml index 1180493d4dfae..8efbda3bf5d94 100644 --- a/.github/workflows/linux_post_commit.yml +++ b/.github/workflows/linux_post_commit.yml @@ -28,8 +28,8 @@ jobs: SharedLibs) export ARGS="--shared-libs" ;; - Assertiosn) - export ARGS="--assertions" + NoAssertions) + export ARGS="--no-assertions" ;; esac mkdir -p $GITHUB_WORKSPACE/build diff --git a/buildbot/configure.py b/buildbot/configure.py index f80859b3affa9..a88c5b9b1e2d4 100644 --- a/buildbot/configure.py +++ b/buildbot/configure.py @@ -42,8 +42,8 @@ def do_configure(args): libclc_targets_to_build = 'nvptx64--;nvptx64--nvidiacl' sycl_build_pi_cuda = 'ON' - if args.assertions: - llvm_enable_assertions = 'ON' + if args.no_assertions: + llvm_enable_assertions = 'OFF' if args.docs: llvm_enable_doxygen = 'ON' @@ -118,7 +118,7 @@ def main(): parser.add_argument("-t", "--build-type", metavar="BUILD_TYPE", required=True, help="build type, debug or release") parser.add_argument("--cuda", action='store_true', help="switch from OpenCL to CUDA") - parser.add_argument("--assertions", action='store_true', help="build with assertions") + parser.add_argument("--no-assertions", action='store_true', help="build without assertions") parser.add_argument("--docs", action='store_true', help="build Doxygen documentation") parser.add_argument("--no-ocl", action='store_true', help="download OpenCL deps via CMake") parser.add_argument("--shared-libs", action='store_true', help="Build shared libraries") From e5620e1f21470ac2be94abfb32b0e64c10dceb31 Mon Sep 17 00:00:00 2001 From: Alexey Bader Date: Thu, 2 Apr 2020 12:29:53 +0300 Subject: [PATCH 2/2] Update linux_post_commit.yml Apply code review comments. --- .github/workflows/linux_post_commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux_post_commit.yml b/.github/workflows/linux_post_commit.yml index 8efbda3bf5d94..a308f0ab377b2 100644 --- a/.github/workflows/linux_post_commit.yml +++ b/.github/workflows/linux_post_commit.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - config: ["Default", "SharedLibs", "Assertions"] + config: ["Default", "SharedLibs", "NoAssertions"] steps: - uses: actions/checkout@v2