Skip to content

Commit

Permalink
Fix shellcheck warnings and lower the required CMake version (yugabyt…
Browse files Browse the repository at this point in the history
…e#15195)

- Fix shellcheck warnings in run-test.sh and yb_build.sh.
- Change required CMake version to 3.17.3.
  • Loading branch information
mbautin authored Dec 2, 2022
1 parent e86b803 commit e955529
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
# under the License.
#

cmake_minimum_required(VERSION 3.20.0)
cmake_minimum_required(VERSION 3.17.3)

project(YugabyteDB)

Expand Down
1 change: 1 addition & 0 deletions build-support/run-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ fi

yb_ninja_executable_not_needed=true
if [[ -z ${BUILD_ROOT:-} ]]; then
# shellcheck disable=SC2119
set_build_root
fi
readonly BUILD_ROOT
Expand Down
6 changes: 3 additions & 3 deletions yb_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -478,13 +478,13 @@ run_cxx_build() {
if [[ ${cmake_exit_code} != 0 ]]; then
log "CMake failed with exit code ${cmake_exit_code}."
(
find "${BUILD_ROOT}" -name "CMake*.log" | while read log_path; do
find "${BUILD_ROOT}" -name "CMake*.log" | while read -r cmake_log_path; do
echo
echo "----------------------------------------------------------------------------------"
echo "Contents of ${log_path}:"
echo "Contents of ${cmake_log_path}:"
echo "----------------------------------------------------------------------------------"
echo
cat "${log_path}"
cat "${cmake_log_path}"
echo
echo "----------------------------------------------------------------------------------"
echo
Expand Down

0 comments on commit e955529

Please sign in to comment.