Skip to content

Commit d027ba7

Browse files
Merge branch 'main' into add-clear-rowkey-function
2 parents 5dffde9 + 0423bfa commit d027ba7

File tree

72 files changed

+4553
-559
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+4553
-559
lines changed

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ module(
2121
)
2222

2323
bazel_dep(name = "platforms", version = "1.0.0")
24-
bazel_dep(name = "bazel_skylib", version = "1.7.1")
25-
bazel_dep(name = "rules_cc", version = "0.1.3")
24+
bazel_dep(name = "bazel_skylib", version = "1.8.1")
25+
bazel_dep(name = "rules_cc", version = "0.1.4")
2626
bazel_dep(name = "abseil-cpp", version = "20240722.1", repo_name = "com_google_absl")
2727
bazel_dep(name = "protobuf", version = "29.4", repo_name = "com_google_protobuf")
2828
bazel_dep(name = "boringssl", version = "0.0.0-20230215-5c22014")

bazel/workspace0.bzl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,20 @@ def gl_cpp_workspace0(name = None):
7171
http_archive,
7272
name = "rules_cc",
7373
urls = [
74-
"https://github.com/bazelbuild/rules_cc/releases/download/0.1.3/rules_cc-0.1.3.tar.gz",
74+
"https://github.com/bazelbuild/rules_cc/releases/download/0.1.4/rules_cc-0.1.4.tar.gz",
7575
],
76-
sha256 = "64cb81641305dcf7b3b3d5a73095ee8fe7444b26f7b72a12227d36e15cfbb6cb",
77-
strip_prefix = "rules_cc-0.1.3",
76+
sha256 = "0d3b4f984c4c2e1acfd1378e0148d35caf2ef1d9eb95b688f8e19ce0c41bdf5b",
77+
strip_prefix = "rules_cc-0.1.4",
7878
)
7979

8080
# protobuf requires this
8181
maybe(
8282
http_archive,
8383
name = "bazel_skylib",
84-
sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",
84+
sha256 = "51b5105a760b353773f904d2bbc5e664d0987fbaf22265164de65d43e910d8ac",
8585
urls = [
86-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
87-
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
86+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.8.1/bazel-skylib-1.8.1.tar.gz",
87+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.8.1/bazel-skylib-1.8.1.tar.gz",
8888
],
8989
)
9090

@@ -93,9 +93,9 @@ def gl_cpp_workspace0(name = None):
9393
http_archive,
9494
name = "build_bazel_rules_apple",
9595
urls = [
96-
"https://github.com/bazelbuild/rules_apple/releases/download/4.0.1/rules_apple.4.0.1.tar.gz",
96+
"https://github.com/bazelbuild/rules_apple/releases/download/4.1.1/rules_apple.4.1.1.tar.gz",
9797
],
98-
sha256 = "b28822cb81916fb544119f5533de010cc67ec6a789f2e7d0fc19d53bfcbb8285",
98+
sha256 = "e21e13568f6cbd1167a3b4c29ee865440c11b680153a7b6014ee15e64cc57c2d",
9999
)
100100

101101
# Load Abseil

ci/cloudbuild/builds/cmake-oldest-deps.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ source module ci/cloudbuild/builds/lib/integration.sh
2727
source module ci/cloudbuild/builds/lib/vcpkg.sh
2828
source module ci/lib/io.sh
2929

30-
mapfile -t feature_list < <(features::always_build | grep -v "experimental-bigquery")
30+
# TODO(#14944): add bigtable back when we are able to update vcpkg version.
31+
mapfile -t feature_list < <(features::always_build | grep -v "experimental-bigquery" | grep -v "bigtable")
3132
ENABLED_FEATURES="$(printf ",%s" "${feature_list[@]}")"
3233
ENABLED_FEATURES="${ENABLED_FEATURES:1}"
3334
readonly ENABLED_FEATURES

ci/cloudbuild/cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ logsBucket: 'gs://${_LOGS_BUCKET}/logs/google-cloud-cpp/${_TRIGGER_SOURCE}/${COM
9090
steps:
9191
# Builds the docker image that will be used by the main build step. Makes 3
9292
# attempts to workaround #6438.
93-
- name: 'gcr.io/kaniko-project/executor:v1.23.2-debug'
93+
- name: 'gcr.io/kaniko-project/executor:v1.24.0-debug'
9494
id: 'kaniko-build'
9595
entrypoint: '/busybox/sh'
9696
args:

ci/cloudbuild/dockerfiles/demo-alpine-stable.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20
7777
-DCMAKE_BUILD_TYPE=Release \
7878
-DBUILD_SHARED_LIBS=yes \
7979
-DWITH_EXAMPLES=OFF \
80+
-DWITH_STL=CXX14 \
8081
-DWITH_ABSEIL=ON \
8182
-DBUILD_TESTING=OFF \
8283
-DOPENTELEMETRY_INSTALL=ON \

ci/cloudbuild/dockerfiles/demo-debian-bookworm.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20
9494
-DCMAKE_BUILD_TYPE=Release \
9595
-DBUILD_SHARED_LIBS=yes \
9696
-DWITH_EXAMPLES=OFF \
97+
-DWITH_STL=CXX14 \
9798
-DWITH_ABSEIL=ON \
9899
-DBUILD_TESTING=OFF \
99100
-DOPENTELEMETRY_INSTALL=ON \

ci/cloudbuild/dockerfiles/demo-debian-bullseye.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz
108108

109109
# ```bash
110110
WORKDIR /var/tmp/build/re2
111-
RUN curl -fsSL https://github.com/google/re2/archive/2024-07-02.tar.gz | \
111+
RUN curl -fsSL https://github.com/google/re2/archive/2025-07-22.tar.gz | \
112112
tar -xzf - --strip-components=1 && \
113113
cmake -DCMAKE_BUILD_TYPE=Release \
114114
-DBUILD_SHARED_LIBS=ON \
@@ -158,6 +158,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20
158158
-DCMAKE_BUILD_TYPE=Release \
159159
-DBUILD_SHARED_LIBS=yes \
160160
-DWITH_EXAMPLES=OFF \
161+
-DWITH_STL=CXX14 \
161162
-DWITH_ABSEIL=ON \
162163
-DBUILD_TESTING=OFF \
163164
-DOPENTELEMETRY_INSTALL=ON \

ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20
8585
-DCMAKE_BUILD_TYPE=Release \
8686
-DBUILD_SHARED_LIBS=yes \
8787
-DWITH_EXAMPLES=OFF \
88+
-DWITH_STL=CXX14 \
8889
-DWITH_ABSEIL=ON \
8990
-DBUILD_TESTING=OFF \
9091
-DOPENTELEMETRY_INSTALL=ON \

ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20
6565
-DCMAKE_BUILD_TYPE=Release \
6666
-DBUILD_SHARED_LIBS=yes \
6767
-DWITH_EXAMPLES=OFF \
68+
-DWITH_STL=CXX14 \
6869
-DWITH_ABSEIL=ON \
6970
-DBUILD_TESTING=OFF \
7071
-DOPENTELEMETRY_INSTALL=ON \

ci/cloudbuild/dockerfiles/demo-rockylinux-9.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ RUN curl -fsSL https://github.com/protocolbuffers/protobuf/archive/v29.4.tar.gz
108108

109109
# ```bash
110110
WORKDIR /var/tmp/build/re2
111-
RUN curl -fsSL https://github.com/google/re2/archive/2024-07-02.tar.gz | \
111+
RUN curl -fsSL https://github.com/google/re2/archive/2025-07-22.tar.gz | \
112112
tar -xzf - --strip-components=1 && \
113113
cmake -DCMAKE_BUILD_TYPE=Release \
114114
-DBUILD_SHARED_LIBS=ON \
@@ -205,6 +205,7 @@ RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20
205205
-DCMAKE_BUILD_TYPE=Release \
206206
-DBUILD_SHARED_LIBS=yes \
207207
-DWITH_EXAMPLES=OFF \
208+
-DWITH_STL=CXX14 \
208209
-DWITH_ABSEIL=ON \
209210
-DBUILD_TESTING=OFF \
210211
-DOPENTELEMETRY_INSTALL=ON \

0 commit comments

Comments
 (0)