From 99cb2cd49fe146e066e51c96e843144f086bc3b8 Mon Sep 17 00:00:00 2001
From: driazati <driazati@users.noreply.github.com>
Date: Thu, 8 Sep 2022 15:49:50 -0700
Subject: [PATCH] [ci][docker] Use CMake 3.20.0 for cortexm

The Zephyr project builds require 3.20.0 to work correctly
---
 docker/Dockerfile.ci_cortexm                  |  2 +-
 docker/install/ubuntu_install_cmake_source.sh | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile.ci_cortexm b/docker/Dockerfile.ci_cortexm
index fb3c10d393f0..d646704bb0a8 100644
--- a/docker/Dockerfile.ci_cortexm
+++ b/docker/Dockerfile.ci_cortexm
@@ -33,7 +33,7 @@ COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh
 RUN bash /install/ubuntu1804_install_python.sh
 
 COPY install/ubuntu_install_cmake_source.sh /install/ubuntu_install_cmake_source.sh
-RUN bash /install/ubuntu_install_cmake_source.sh
+RUN bash /install/ubuntu_install_cmake_source.sh 3.20.0
 
 COPY install/ubuntu1804_install_python_venv.sh /install/ubuntu1804_install_python_venv.sh
 RUN bash /install/ubuntu1804_install_python_venv.sh
diff --git a/docker/install/ubuntu_install_cmake_source.sh b/docker/install/ubuntu_install_cmake_source.sh
index 030cb4ea0406..702130f07964 100755
--- a/docker/install/ubuntu_install_cmake_source.sh
+++ b/docker/install/ubuntu_install_cmake_source.sh
@@ -20,13 +20,19 @@ set -e
 set -u
 set -o pipefail
 
-v=3.18
-version=3.18.4
+if [ -z ${1+x} ]; then
+    version=3.18.4
+else
+    version=$1
+fi
+
+v=$(echo $version | sed 's/\(.*\)\..*/\1/g')
+echo "Installing cmake $version ($v)"
 wget https://cmake.org/files/v${v}/cmake-${version}.tar.gz
 tar xvf cmake-${version}.tar.gz
 cd cmake-${version}
 ./bootstrap
-make -j$(nproc)
+make -j"$(nproc)"
 make install
 cd ..
 rm -rf cmake-${version} cmake-${version}.tar.gz