This is an automated email from the ASF dual-hosted git repository. bneradt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git
The following commit(s) were added to refs/heads/main by this push: new 80dc413 cmake Dockerfile updates (#226) 80dc413 is described below commit 80dc413893b536cb1f732a72d9265b5d9f9f8591 Author: Brian Neradt <brian.ner...@gmail.com> AuthorDate: Sat Oct 14 13:58:18 2023 -0500 cmake Dockerfile updates (#226) --- docker/debian/Dockerfile | 5 +++-- docker/rockylinux8/Dockerfile | 2 +- docker/ubuntu2304/Dockerfile | 2 +- jenkins/github/debian.pipeline | 2 +- jenkins/github/ubuntu.pipeline | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docker/debian/Dockerfile b/docker/debian/Dockerfile index c9e3d1c..b592440 100644 --- a/docker/debian/Dockerfile +++ b/docker/debian/Dockerfile @@ -8,13 +8,14 @@ RUN <<EOT /bin/bash apt-get -y update apt-get -y install build-essential llvm ccache \ make pkgconf bison flex g++ clang gettext libc++-dev autoconf automake \ - libtool autotools-dev git distcc file wget openssl hwloc intltool-debian + libtool autotools-dev git distcc file wget openssl hwloc intltool-debian \ + cmake ninja-build apt-get -y install libssl-dev libexpat1-dev \ libpcre3-dev libcap-dev libhwloc-dev libunwind8 libunwind-dev zlib1g-dev \ libjemalloc-dev libluajit-5.1-dev liblzma-dev \ libhiredis-dev libncurses-dev libgeoip-dev libmagick++-dev - + apt-get -y autoremove apt-get -y clean EOT diff --git a/docker/rockylinux8/Dockerfile b/docker/rockylinux8/Dockerfile index 5f14fb6..8df5dc5 100644 --- a/docker/rockylinux8/Dockerfile +++ b/docker/rockylinux8/Dockerfile @@ -13,7 +13,7 @@ RUN <<EOF # Build tools. yum -y install \ - ccache make pkgconfig bison flex gcc-c++ clang cmake \ + ccache make pkgconfig bison flex gcc-c++ clang cmake ninja-build \ autoconf automake libtool \ gcc-toolset-11 gcc-toolset-11-libasan-devel diff --git a/docker/ubuntu2304/Dockerfile b/docker/ubuntu2304/Dockerfile index f2d5f65..e2042f9 100644 --- a/docker/ubuntu2304/Dockerfile +++ b/docker/ubuntu2304/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update; \ apt-get -y install build-essential llvm lld ccache \ make pkgconf bison flex g++ clang gettext libc++-dev autoconf automake \ libtool autotools-dev git distcc file wget openssl hwloc intltool-debian \ - clang-tools-14 clang-14 ; \ + clang-tools-14 clang-14 cmake ninja-build; \ apt-get -y install libssl-dev libexpat1-dev \ libpcre3-dev libcap-dev libhwloc-dev libunwind8 libunwind-dev zlib1g-dev \ diff --git a/jenkins/github/debian.pipeline b/jenkins/github/debian.pipeline index 2b55b12..ec68625 100644 --- a/jenkins/github/debian.pipeline +++ b/jenkins/github/debian.pipeline @@ -50,7 +50,7 @@ pipeline { # `false -a`: Always run autotools until -DENABLE_HARDENING=ON is implemented. if [ false -a -d cmake ] then - cmake -B cmake-build-release --preset ci -G "Unix Makefiles" -DOPENSSL_ROOT_DIR=/opt/openssl-quic -DENABLE_HARDENING=ON + cmake -B cmake-build-release --preset ci -DOPENSSL_ROOT_DIR=/opt/openssl-quic -DENABLE_HARDENING=ON cmake --build cmake-build-release -v cmake --install cmake-build-release pushd cmake-build-release diff --git a/jenkins/github/ubuntu.pipeline b/jenkins/github/ubuntu.pipeline index 7ec7a38..c4844cf 100644 --- a/jenkins/github/ubuntu.pipeline +++ b/jenkins/github/ubuntu.pipeline @@ -58,7 +58,7 @@ pipeline { # sure we can build with the flag set. sed -i 's/CMAKE_CXX_STANDARD 17/CMAKE_CXX_STANDARD 20/g' CMakeLists.txt - cmake -B build --preset ci -G "Unix Makefiles" + cmake -B build --preset ci cmake --build build -v cmake --install build pushd build