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 1ccb199 fedora:39 hacks to finish build the image (#208)
1ccb199 is described below
commit 1ccb1998ca1d7d3f14e1db0095e7d050d46aeb44
Author: Brian Neradt <[email protected]>
AuthorDate: Thu Aug 17 14:23:06 2023 -0500
fedora:39 hacks to finish build the image (#208)
We won't use some of these differences long term, but at least it gets
the build working so we can test with fedora:39.
---
docker/fedora39/Dockerfile | 12 ++++--------
docker/fedora39/build_h3_tools.sh | 4 ++++
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docker/fedora39/Dockerfile b/docker/fedora39/Dockerfile
index 5a529ed..bea0260 100644
--- a/docker/fedora39/Dockerfile
+++ b/docker/fedora39/Dockerfile
@@ -6,9 +6,10 @@ FROM fedora:39
RUN <<EOF
set -e
- dnf -y install dnf-plugins-core
- dnf repolist
- dnf -y update
+ # TODO: Add these back in when fedora:39 hacks aren't needed anymore.
+ #dnf -y install dnf-plugins-core
+ #dnf repolist
+ #dnf -y update
# Build tools.
dnf -y install \
@@ -50,11 +51,6 @@ RUN <<EOF
EOF
ARG PATH=/opt/bin:$PATH
-# This currently fails with latest fedora:38. Presumably the stock pip is
-# recent enough, so this shouldn't be a big deal.
-# RUN pip3 install --upgrade pip
-RUN pip3 install pipenv httpbin
-
#-------------------------------------------------------------------------------
# Install the HTTP/3 build tools, including openssl-quic.
#-------------------------------------------------------------------------------
diff --git a/docker/fedora39/build_h3_tools.sh
b/docker/fedora39/build_h3_tools.sh
index 9ae66f3..3021e5d 100644
--- a/docker/fedora39/build_h3_tools.sh
+++ b/docker/fedora39/build_h3_tools.sh
@@ -128,10 +128,14 @@ fi
cd boringssl
mkdir -p build
cd build
+
+# TODO: Remove -Wno-error=ignored-attributes when the following is fixed:
+# https://bugs.chromium.org/p/boringssl/issues/detail?id=642
cmake \
-DGO_EXECUTABLE=${GO_BINARY_PATH} \
-DCMAKE_INSTALL_PREFIX=${BASE}/boringssl \
-DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_CXX_FLAGS='-Wno-error=ignored-attributes' \
-DBUILD_SHARED_LIBS=1 ../
${MAKE} -j ${num_threads}