Merge partly of open-telemetry#1844

Signed-off-by: owent <[email protected]>
owent · Dec 8, 2022 · aa64410 · aa64410
1 parent 6f4630d
commit aa64410
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/ci/setup_cmake.sh b/ci/setup_cmake.sh
@@ -8,9 +8,14 @@ set -e
 export DEBIAN_FRONTEND=noninteractive
 apt-get update
 
-export CMAKE_VERSION=3.15.2
-
-[ -z "${GOOGLETEST_VERSION}" ] && export GOOGLETEST_VERSION=1.12.1
+if [ "x$CMAKE_VERSION" = "x" ]; then
+export GOOGLETEST_VERSION=1.10.0
+  export CMAKE_VERSION=3.15.2
+fi
+
+if [ "x$GOOGLETEST_VERSION" = "x" ]; then
+  export GOOGLETEST_VERSION=1.12.1
+fi
 
 cmake_install() {
     tmp_dir=$(mktemp -d)