Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ci][docker] Use CMake 3.20.0 for cortexm #12744

Merged
merged 1 commit into from
Sep 9, 2022
Merged

[ci][docker] Use CMake 3.20.0 for cortexm #12744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/Dockerfile.ci_cortexm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 9 additions & 3 deletions docker/install/ubuntu_install_cmake_source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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