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 eef7d82 ubuntu:20.04 - Update to clang-12 (#256)
eef7d82 is described below
commit eef7d82bb3f6d555c45faf43a5d0518cc3b4b8b9
Author: Brian Neradt <[email protected]>
AuthorDate: Tue Oct 24 12:24:44 2023 -0500
ubuntu:20.04 - Update to clang-12 (#256)
This is the latest system version of clang ubuntu:20.04 supports. This
also updates cmake to a recent enough version to build our ATS cmake
builds.
---
docker/ubuntu2004/Dockerfile | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/docker/ubuntu2004/Dockerfile b/docker/ubuntu2004/Dockerfile
index 3c0a8d7..794e57b 100644
--- a/docker/ubuntu2004/Dockerfile
+++ b/docker/ubuntu2004/Dockerfile
@@ -10,7 +10,7 @@ RUN <<EOF
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-10 clang-10 cmake ninja-build
+ clang-tools-12 clang-12 ninja-build
apt-get -y install libssl-dev libexpat1-dev \
libpcre3-dev libcap-dev libhwloc-dev libunwind8 libunwind-dev zlib1g-dev \
@@ -22,6 +22,15 @@ RUN <<EOF
apt-get -y clean
EOF
+RUN <<EOF
+ set -e
+ cd /root
+ wget
https://github.com/Kitware/CMake/releases/download/v3.27.7/cmake-3.27.7-linux-x86_64.sh
+ chmod +x cmake-3.27.7-linux-x86_64.sh
+ bash ./cmake-3.27.7-linux-x86_64.sh --skip-license --prefix=/opt
+ rm cmake-3.27.7-linux-x86_64.sh
+EOF
+
# Add the CI's test user. N.B: 1200 is the uid that our jenkins user is
# configured with, so that has to be used. Otherwise there will be permissions
# issues.
@@ -39,3 +48,12 @@ RUN <<EOF
echo "${username} ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers
chown -R ${username} /home/${username}
EOF
+
+# We put our custom packages in /opt and we want to use the llvm clang-12.
+RUN <<EOF
+ set -e
+ mkdir -p /opt/bin
+ chmod 755 /opt/bin
+ echo 'PATH=/opt/bin:/usr/lib/llvm-12/bin:$PATH' | tee -a /etc/bash.bashrc
+EOF
+ARG PATH=/opt/bin:/usr/lib/llvm-12/bin:$PATH
