diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d174b5637ffe0237cdf8724044a04de422dcd6d..e4fc617b68d6b91e148a1f40ba8d40a4c2ccf730 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ project(gpopt LANGUAGES CXX C) set(CMAKE_CXX_STANDARD 98) set(GPORCA_VERSION_MAJOR 3) set(GPORCA_VERSION_MINOR 92) -set(GPORCA_VERSION_PATCH 1) +set(GPORCA_VERSION_PATCH 2) set(GPORCA_VERSION_STRING "${GPORCA_VERSION_MAJOR}.${GPORCA_VERSION_MINOR}.${GPORCA_VERSION_PATCH}") # Whenever an ABI-breaking change is made to GPORCA, this should be incremented. diff --git a/README.md b/README.md index bc918e874559320fdb5179fe5371937debe8d488..d76718fb55b0e220770de9c18f7a9960b4716d91 100644 --- a/README.md +++ b/README.md @@ -219,7 +219,7 @@ Here are a few build flavors (commands run from the ORCA checkout directory): ``` # debug build -cmake -GNinja -D CMAKE_BUILD_TYPE=DEBUG -H. -Bbuild.debug +cmake -GNinja -D CMAKE_BUILD_TYPE=Debug -H. -Bbuild.debug ``` ``` diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index c0af78ce3468d788a5d70e22d5b6bb985afa1879..9f86f1f642f3f3a37526ba2d4ea25292e1752612 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -339,7 +339,7 @@ jobs: image: centos5-build file: orca_src/concourse/build_and_test.yml params: - BUILD_TYPE: --build_type=DEBUG + BUILD_TYPE: --build_type=Debug OUTPUT_DIR: --output_dir=build_and_test/install SKIP_TESTS: '' - task: package_tarball_debug @@ -393,7 +393,7 @@ jobs: image: centos6-build file: orca_src/concourse/build_and_test.yml params: - BUILD_TYPE: --build_type=DEBUG + BUILD_TYPE: --build_type=Debug OUTPUT_DIR: --output_dir=build_and_test/install - task: package_tarball_debug image: centos6-build @@ -446,7 +446,7 @@ jobs: image: centos7-build file: orca_src/concourse/build_and_test.yml params: - BUILD_TYPE: --build_type=DEBUG + BUILD_TYPE: --build_type=Debug OUTPUT_DIR: --output_dir=build_and_test/install - task: package_tarball_debug image: centos7-build @@ -498,7 +498,7 @@ jobs: - task: build_and_test_debug file: orca_src/concourse/build_and_test.yml params: - BUILD_TYPE: --build_type=DEBUG + BUILD_TYPE: --build_type=Debug OUTPUT_DIR: --output_dir=build_and_test/install SKIP_TESTS: "" image: ubuntu18.04-build diff --git a/concourse/pr_pipeline.yml b/concourse/pr_pipeline.yml index 470a8a4f081254e49037d694963cc4a39c279517..8d2536d80af2d0ddc6d8653b4846a0476eaf823a 100644 --- a/concourse/pr_pipeline.yml +++ b/concourse/pr_pipeline.yml @@ -94,7 +94,7 @@ jobs: file: orca_src/concourse/build_and_test.yml image: centos5-build params: - BUILD_TYPE: --build_type=DEBUG + BUILD_TYPE: --build_type=Debug OUTPUT_DIR: --output_dir=build_and_test/install_debug timeout: 30m on_failure: &pr_failure diff --git a/concourse/test_orca_pipeline.yml b/concourse/test_orca_pipeline.yml index 40108205f5f8dba231b2dfe2b35e47f69ee1c8d6..1ad7bbf230cbbd331969c91ea2d1f381f044d3ae 100644 --- a/concourse/test_orca_pipeline.yml +++ b/concourse/test_orca_pipeline.yml @@ -176,7 +176,7 @@ jobs: - task: untar_build_and_test_debug file: orca_main_src/concourse/untar_build_and_test.yml params: - BUILD_TYPE: --build_type=DEBUG + BUILD_TYPE: --build_type=Debug OUTPUT_DIR: --output_dir=build_and_test/install SKIP_TESTS: '' - in_parallel: diff --git a/concourse/untar_build_and_test.py b/concourse/untar_build_and_test.py index 58d19147d4ece207de1d746eaa3d26c69bf541ed..458c57a5944a256f4c052354e739603dbb4daa00 100755 --- a/concourse/untar_build_and_test.py +++ b/concourse/untar_build_and_test.py @@ -6,7 +6,7 @@ import sys BUILD_TYPE=os.environ['BUILD_TYPE'] OUTPUT_DIR=os.environ['OUTPUT_DIR'] SKIP_TESTS=os.environ['SKIP_TESTS'] -if 'DEBUG' in BUILD_TYPE: +if 'Debug' in BUILD_TYPE: path_identifier = 'debug' else: path_identifier = 'release'