Skip to content

Commit 9746980

Browse files
authored
ci: update yaml-cpp (#11096)
1 parent 855d3d2 commit 9746980

1 file changed

Lines changed: 15 additions & 1 deletion

File tree

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN dnf makecache && dnf install -y "dnf-command(debuginfo-install)"
4040
RUN dnf makecache && dnf debuginfo-install -y libstdc++
4141

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

4545
# Sets root's password to the empty string to enable users to get a root shell
4646
# inside the container with `su -` and no password. Sudo would not work because
@@ -63,6 +63,20 @@ RUN curl -sSL https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.g
6363
ldconfig
6464
ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib64/pkgconfig
6565

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

0 commit comments

Comments
 (0)