[trafficserver-ci] branch main updated: Updating the h3 tools pins (#37)

[bn...@apache.org]

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 d31f1d8  Updating the h3 tools pins (#37)
d31f1d8 is described below

commit d31f1d897799d62b5447cf480064210f067b3706
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Thu Aug 12 12:23:49 2021 -0500

    Updating the h3 tools pins (#37)
    
    This also keeps around the h3 tools build directory for people to
    reference later.
---
 docker/centos/Dockerfile        |  3 +--
 docker/centos/build_h3_tools.sh | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
index 7ee2234..7f553ec 100644
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -29,14 +29,13 @@ RUN alternatives --set python /usr/bin/python3.8
 RUN yum -y install libev-devel jemalloc-devel libxml2-devel \
     c-ares-devel libevent-devel jansson-devel zlib-devel systemd-devel
 
-ARG h3_tools_dir=/var/tmp/h3_tools_tmp
+ARG h3_tools_dir=/root/build_h3_tools
 RUN mkdir -p ${h3_tools_dir}
 WORKDIR ${h3_tools_dir}
 COPY /build_h3_tools.sh ${h3_tools_dir}/build_h3_tools.sh
 # This will install OpenSSL QUIC and related tools in /opt.
 RUN bash ${h3_tools_dir}/build_h3_tools.sh
 WORKDIR /root
-RUN rm -rf ${h3_tools_dir}
 
 # Make sure we pick up this built version of curl, which is in /opt/bin.
 RUN echo 'PATH=/opt/bin:$PATH' | tee -a /etc/profile.d/curl_http3.sh
diff --git a/docker/centos/build_h3_tools.sh b/docker/centos/build_h3_tools.sh
index aa064c6..7ebc015 100755
--- a/docker/centos/build_h3_tools.sh
+++ b/docker/centos/build_h3_tools.sh
@@ -93,7 +93,7 @@ cd ..
 echo "Building nghttp3..."
 [ ! -d nghttp3 ] && git clone https://github.com/ngtcp2/nghttp3.git
 cd nghttp3
-git checkout 40943cacd18f3c8460843bffcb31775e589de668
+git checkout d9605232a39e171f7b5b76d16213e0925bd1ed58
 autoreconf -if
 ./configure --prefix=${BASE} PKG_CONFIG_PATH=${BASE}/lib/pkgconfig:${OPENSSL_PREFIX}/lib/pkgconfig CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
 ${MAKE} -j $(nproc)
@@ -104,7 +104,7 @@ cd ..
 echo "Building ngtcp2..."
 [ ! -d ngtcp2 ] && git clone https://github.com/ngtcp2/ngtcp2.git
 cd ngtcp2
-git checkout 75c5f08ef75055adb5412682b1c96773e2a29665
+git checkout d23e3431d86e5047a756172c6b2cbecab9cea3d4
 autoreconf -if
 ./configure --prefix=${BASE} PKG_CONFIG_PATH=${BASE}/lib/pkgconfig:${OPENSSL_PREFIX}/lib/pkgconfig CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
 ${MAKE} -j $(nproc)
@@ -119,13 +119,13 @@ git checkout --track -b quic origin/quic
 # This commit will be removed whenever the nghttp2 author rebases origin/quic.
 # For reference, this commit is currently described as:
 #
-# commit cdf58e370e6a843b0965aabcd75908ca52633b60
+# commit 19cf303828eca4653130e1aaf27aa57319e3b819
 # Author: Tatsuhiro Tsujikawa <ta...@gmail.com>
 # Date:   Sat Mar 27 23:37:37 2021 +0900
 #
 #     Compile with the latest ngtcp2
 
-git checkout cdf58e370e6a843b0965aabcd75908ca52633b60
+git checkout 19cf303828eca4653130e1aaf27aa57319e3b819
 autoreconf -if
 ./configure --prefix=${BASE} PKG_CONFIG_PATH=${BASE}/lib/pkgconfig:${OPENSSL_PREFIX}/lib/pkgconfig CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
 ${MAKE} -j $(nproc)
@@ -136,7 +136,7 @@ cd ..
 echo "Building curl ..."
 [ ! -d curl ] && git clone https://github.com/curl/curl.git
 cd curl
-git checkout 56cf2de5ac217296778c8fc0d037c922e63ff38e
+git checkout 2bfa57bff184437028025933d26fecb215355173
 autoreconf -i
 ./configure --prefix=${BASE} --with-ssl=${OPENSSL_PREFIX} --with-nghttp2=${BASE} --with-nghttp3=${BASE} --with-ngtcp2=${BASE} CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
 ${MAKE} -j $(nproc)