Skip to content

Commit c9bdeeb

Browse files
authored
chore: merge prepare-for-v3.0.0 branch into main (googleapis#15962)
1 parent 6a4b2fb commit c9bdeeb

11,175 files changed

Lines changed: 43865 additions & 107456 deletions

File tree

Some content is hidden

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

.bazelrc

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@
1818
# Use host-OS-specific config lines from bazelrc files.
1919
build --enable_platform_specific_config=true
2020

21-
# The project requires C++ >= 14. By default Bazel adds `-std=c++0x` which
22-
# disables C++14 features, even if the compilers defaults to C++ >= 14
23-
build:linux --cxxopt=-std=c++14
24-
build:macos --cxxopt=-std=c++14
25-
# Protobuf and gRPC require (or soon will require) C++14 to compile the "host"
21+
build --features=external_include_paths
22+
build --cxxopt=-Wno-private-header
23+
24+
# The project requires C++ >= 17.
25+
build:linux --cxxopt=-std=c++17
26+
build:macos --cxxopt=-std=c++17
27+
# Protobuf and gRPC require C++17 to compile the "host"
2628
# targets, such as protoc and the grpc plugin.
27-
build:linux --host_cxxopt=-std=c++14
28-
build:macos --host_cxxopt=-std=c++14
29+
build:linux --host_cxxopt=-std=c++17
30+
build:macos --host_cxxopt=-std=c++17
2931

3032
# Do not create the convenience links. They are inconvenient when the build
3133
# runs inside a docker image or if one builds a quickstart and then builds
@@ -47,9 +49,6 @@ build --experimental_ui_max_stdouterr_bytes=-1
4749
# in a random order to help expose undesirable interdependencies.
4850
test --test_env=GTEST_SHUFFLE --test_env=GTEST_RANDOM_SEED
4951

50-
# By default, build the library with OpenTelemetry
51-
build --//:enable_opentelemetry
52-
5352
# Don't show warnings when building external dependencies. This still shows
5453
# warnings when using these dependencies (say in headers).
5554
build --output_filter='^//((?!(external):).)*$'
@@ -70,6 +69,8 @@ build:sanitizer --strip=never
7069
build:sanitizer --copt=-Og
7170
build:sanitizer --copt=-g
7271
build:sanitizer --copt=-fno-omit-frame-pointer
72+
#build:sanitizer --features=external_include_paths
73+
7374

7475
# --config asan: Address Sanitizer
7576
build:asan --config=sanitizer
@@ -102,6 +103,8 @@ build:ubsan --copt=-DCURL_STRICTER
102103
build:ubsan --linkopt=-fsanitize=undefined
103104
build:ubsan --linkopt=-fsanitize-link-c++-runtime
104105
build:ubsan --action_env=UBSAN_OPTIONS=halt_on_error=1:print_stacktrace=1
106+
#build:ubsan --features=external_include_paths
107+
105108

106109
# --config xsan: Runs misc. sanitizers that aren't covered elsewhere.
107110
build:xsan --config=sanitizer
@@ -128,3 +131,4 @@ build:msan --linkopt=-L/usr/lib/x86_64-unknown-linux-gnu
128131

129132
# --config otel2: Open Telemetery ABI version 2
130133
build:otel2 --cxxopt=-DOPENTELEMETRY_ABI_VERSION_NO=2
134+
build:otel2 --@opentelemetry-cpp//api:abi_version_no=2

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.6.1
1+
8.4.2

.clang-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ Checks: >
8585
performance-*,
8686
portability-*,
8787
readability-*,
88+
-bugprone-exception-escape,
8889
-google-readability-braces-around-statements,
8990
-google-readability-namespace-comments,
9091
-google-runtime-references,

.github/workflows/macos-cmake.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
- uses: actions/setup-python@v5
7171
id: py311
7272
with:
73-
python-version: '3.11'
73+
python-version: '3.13'
7474
- uses: google-github-actions/setup-gcloud@v2
7575
env:
7676
CLOUDSDK_PYTHON: ${{ steps.py311.outputs.python-path }}
@@ -84,8 +84,6 @@ jobs:
8484
spanner
8585
)
8686
core2_features=(
87-
pubsub
88-
pubsublite
8987
storage
9088
storage_grpc
9189
)

.github/workflows/windows-cmake.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
msvc: [ msvc-2022 ]
4242
build_type: [ Release ]
4343
arch: [ x64 ]
44-
shard: [ Core1 ]
44+
shard: [ Core1, Core2, Core3, Core4, Core5, Compute, AIPlatform, Shard1, Shard2, Shard3, Shard4, Shard5 ]
4545
exclude:
4646
# Also skip shards (Compute and Other) that contain only generated code.
4747
- exclude-from-full-trick: ${{ ! inputs.full-matrix }}
@@ -76,7 +76,7 @@ jobs:
7676
- uses: actions/setup-python@v5
7777
id: py311
7878
with:
79-
python-version: '3.11'
79+
python-version: '3.13'
8080
- uses: google-github-actions/setup-gcloud@v2
8181
env:
8282
CLOUDSDK_PYTHON: ${{ steps.py311.outputs.python-path }}
@@ -103,6 +103,7 @@ jobs:
103103
dataproc
104104
discoveryengine
105105
monitoring
106+
opentelemetry
106107
retail
107108
sql
108109
dialogflow_cx
@@ -209,6 +210,8 @@ jobs:
209210
universe_domain
210211
)
211212
shard5_features=(
213+
asset
214+
channel
212215
video
213216
datacatalog
214217
iam
@@ -269,10 +272,6 @@ jobs:
269272
skipped_features+=("${shard3_features[@]}")
270273
skipped_features+=("${shard4_features[@]}")
271274
skipped_features+=("${shard5_features[@]}")
272-
# We use vcpkg in this build, which ships with Protobuf v21.x.
273-
# Both `asset` and `channel` require Protobuf >= 23.x to compile on
274-
# Windows.
275-
skipped_features+=(asset channel)
276275
skipped="$(printf ",-%s" "${skipped_features[@]}")"
277276
echo "features=__ga_libraries__,__experimental_libraries__,${skipped:1}" >> "${GITHUB_OUTPUT}"
278277
fi

.typos.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ extend-exclude = [
6262
"external/googleapis.patch",
6363
# Mispelled test names in Bigtable conformance tests
6464
"google/cloud/bigtable/ci/run_conformance_tests_proxy_bazel.sh",
65+
# ports files don't need to be checked
66+
"google/cloud/ports_def.inc",
67+
"google/cloud/ports_undef.inc",
6568
]
6669

6770
[default]

BUILD.bazel

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,3 @@ cc_library(
254254
"//google/cloud:google_cloud_cpp_universe_domain",
255255
],
256256
)
257-
258-
bool_flag(
259-
name = "enable_opentelemetry",
260-
build_setting_default = False,
261-
)

0 commit comments

Comments
 (0)