Skip to content

Commit 82eb0e5

Browse files
authored
ci: simplify Dockerfile for CMake builds (#12740)
1 parent 70c9921 commit 82eb0e5

File tree

1 file changed

+4
-18
lines changed

1 file changed

+4
-18
lines changed

ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ RUN dnf makecache && dnf install -y java-latest-openjdk
3939
RUN dnf makecache && dnf install -y "dnf-command(debuginfo-install)"
4040
RUN dnf makecache && dnf debuginfo-install -y libstdc++
4141

42-
# This is used by the docfx tool.
43-
RUN dnf makecache && dnf install -y pugixml-devel
42+
# These are used by the docfx tool.
43+
RUN dnf makecache && dnf install -y pugixml-devel yaml-cpp-devel
4444

4545
# This is used in the `publish-docs` build
4646
RUN dnf makecache && dnf install -y libxslt
@@ -66,22 +66,8 @@ RUN curl -fsSL https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.
6666
ldconfig
6767
ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib64/pkgconfig
6868

69-
# Installs the yaml-cpp-devel from source. The version included with Fedora:37
70-
# leaves trailing whitespace in the output:
71-
# https://github.com/jbeder/yaml-cpp/pull/1005
72-
WORKDIR /var/tmp/build
73-
RUN curl -fsSL https://github.com/jbeder/yaml-cpp/archive/refs/tags/yaml-cpp-0.7.0.tar.gz | \
74-
tar -xzf - --strip-components=1 && \
75-
cmake \
76-
-DCMAKE_BUILD_TYPE=Release \
77-
-DBUILD_SHARED_LIBS=ON \
78-
-DBUILD_TESTING=OFF \
79-
-GNinja -S . -B cmake-out && \
80-
cmake --build cmake-out --target install && \
81-
ldconfig && cd /var/tmp && rm -fr build
82-
83-
# We expose `absl::optional<>` in our public API. An Abseil LTS update will
84-
# break our `check-api` build, unless we disable the inline namespace.
69+
# We disable the inline namespace because otherwise Abseil LTS updates break our
70+
# `check-api` build.
8571
WORKDIR /var/tmp/build
8672
RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20230802.1.tar.gz | \
8773
tar -xzf - --strip-components=1 && \

0 commit comments

Comments
 (0)