Skip to content

Commit b22c75c

Browse files
committed
more fedora44 adjustments
1 parent c4726d9 commit b22c75c

4 files changed

Lines changed: 18 additions & 13 deletions

File tree

ci/cloudbuild/builds/clang-cxx20.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ read -r ENABLED_FEATURES < <(features::always_build_cmake)
3232
ENABLED_FEATURES="${ENABLED_FEATURES},__ga_libraries__"
3333
readonly ENABLED_FEATURES
3434

35+
# Enabling deprecated-declarations requires operator<=>()
3536
io::run cmake "${cmake_args[@]}" \
3637
-DCMAKE_CXX_STANDARD=20 \
3738
-DGOOGLE_CLOUD_CPP_ENABLE_CLANG_ABI_COMPAT_17=ON \
38-
-DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}"
39+
-DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" \
40+
-DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations"
3941
io::run cmake --build cmake-out
4042
mapfile -t ctest_args < <(ctest::common_args)
4143
io::run env -C cmake-out ctest "${ctest_args[@]}" -LE "integration-test"

ci/cloudbuild/builds/cxx20.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ read -r ENABLED_FEATURES < <(features::always_build_cmake)
3232
ENABLED_FEATURES="${ENABLED_FEATURES},__ga_libraries__"
3333
readonly ENABLED_FEATURES
3434

35+
# Enabling deprecated-declarations requires operator<=>()
3536
io::run cmake "${cmake_args[@]}" \
3637
-DCMAKE_CXX_STANDARD=20 \
3738
-DGOOGLE_CLOUD_CPP_ENABLE_CLANG_ABI_COMPAT_17=ON \
38-
-DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}"
39+
-DGOOGLE_CLOUD_CPP_ENABLE="${ENABLED_FEATURES}" \
40+
-DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations"
3941
io::run cmake --build cmake-out
4042
mapfile -t ctest_args < <(ctest::common_args)
4143
io::run env -C cmake-out ctest "${ctest_args[@]}" -LE "integration-test"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,4 @@ RUN curl -fsSL https://github.com/googleapis/cloud-bigtable-clients-test/archive
6767

6868
# Fedora 44 changed where it stores CA certs.
6969
RUN ln -sf /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem /etc/pki/tls/certs/ca-certificates.crt
70+

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,17 @@ ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib
8383

8484
# We disable the inline namespace because otherwise Abseil LTS updates break our
8585
# `check-api` build.
86-
WORKDIR /var/tmp/build
87-
RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250814.2.tar.gz | \
88-
tar -xzf - --strip-components=1 && \
89-
cmake \
90-
-DCMAKE_BUILD_TYPE="Release" \
91-
-DCMAKE_CXX_STANDARD=17 \
92-
-DABSL_BUILD_TESTING=OFF \
93-
-DBUILD_SHARED_LIBS=yes \
94-
-GNinja -S . -B cmake-out && \
95-
cmake --build cmake-out --target install && \
96-
ldconfig && cd /var/tmp && rm -fr build
86+
#WORKDIR /var/tmp/build
87+
#RUN curl -fsSL https://github.com/abseil/abseil-cpp/archive/20250814.2.tar.gz | \
88+
# tar -xzf - --strip-components=1 && \
89+
# cmake \
90+
# -DCMAKE_BUILD_TYPE="Release" \
91+
# -DCMAKE_CXX_STANDARD=17 \
92+
# -DABSL_BUILD_TESTING=OFF \
93+
# -DBUILD_SHARED_LIBS=yes \
94+
# -GNinja -S . -B cmake-out && \
95+
# cmake --build cmake-out --target install && \
96+
# ldconfig && cd /var/tmp && rm -fr build
9797

9898
WORKDIR /var/tmp/build
9999
RUN curl -fsSL https://github.com/google/googletest/archive/v1.16.0.tar.gz | \

0 commit comments

Comments
 (0)