Skip to content

Commit 409b434

Browse files
authored
Merge branch 'main' into fix-billing-quickstart-docs
2 parents 93479aa + fdbec33 commit 409b434

12,182 files changed

Lines changed: 208213 additions & 114645 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/CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* @googleapis/cloud-sdk-cpp-team
77

88
# These libraries are also owned by the GCS clients team.
9-
/google/cloud/storage/ @googleapis/gcs-sdk-team @googleapis/cloud-sdk-cpp-team
10-
/google/cloud/storagecontrol/ @googleapis/gcs-sdk-team @googleapis/cloud-sdk-cpp-team
11-
/google/cloud/storageinsights/ @googleapis/gcs-sdk-team @googleapis/cloud-sdk-cpp-team
12-
/google/cloud/storagetransfer/ @googleapis/gcs-sdk-team @googleapis/cloud-sdk-cpp-team
9+
/google/cloud/storage/ @googleapis/gcs-team @googleapis/cloud-sdk-cpp-team
10+
/google/cloud/storagecontrol/ @googleapis/gcs-team @googleapis/cloud-sdk-cpp-team
11+
/google/cloud/storageinsights/ @googleapis/gcs-team @googleapis/cloud-sdk-cpp-team
12+
/google/cloud/storagetransfer/ @googleapis/gcs-team @googleapis/cloud-sdk-cpp-team

.github/renovate.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"python": {
88
"enabled": false
99
},
10-
"baseBranches": ["main", "/^prepare.*v3/"],
10+
"baseBranches": ["main"],
1111
"regexManagers": [
1212
{
1313
"fileMatch": [
@@ -90,6 +90,7 @@
9090
],
9191
"ignoreDeps": [
9292
"boringssl",
93-
"com_google_googleapis"
93+
"com_google_googleapis",
94+
"googleapis"
9495
]
9596
}

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222

2323
steps:
2424
- name: Checkout repository
25-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
25+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
2626
- name: Checkout vcpkg
27-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
27+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
2828
with:
2929
path: "build/vcpkg"
3030
repository: "microsoft/vcpkg"

.github/workflows/external-account-integration.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
id-token: write
2727

2828
steps:
29-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
29+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
3030
with:
3131
ref: ${{ inputs.checkout-ref }}
3232
- id: auth
@@ -56,9 +56,11 @@ jobs:
5656
working-directory: "${{runner.temp}}"
5757
run: |
5858
mkdir -p vcpkg
59-
curl -fsSL "https://github.com/microsoft/vcpkg/archive/${{ steps.vcpkg-version.outputs.version }}.tar.gz" |
59+
curl -fsSL "https://github.com/microsoft/vcpkg/archive/${STEPS_VCPKG_VERSION_OUTPUTS_VERSION}.tar.gz" |
6060
tar -C vcpkg --strip-components=1 -zxf -
6161
vcpkg/bootstrap-vcpkg.sh -disableMetrics
62+
env:
63+
STEPS_VCPKG_VERSION_OUTPUTS_VERSION: ${{ steps.vcpkg-version.outputs.version }}
6264
# First compile the code using the identity with access to the build cache
6365
- run: |
6466
env VCPKG_ROOT="${{ runner.temp }}/vcpkg" ci/gha/builds/external-account.sh

.github/workflows/macos-cmake.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- exclude-from-full-trick: ${{ ! inputs.full-matrix }}
6060
shard: Other
6161
steps:
62-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
62+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
6363
with:
6464
ref: ${{ inputs.checkout-ref }}
6565
- uses: google-github-actions/auth@v2
@@ -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/test-runner.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
# branches we can disable builds (to speed up the testing) or add new ones,
1010
# without impacting the rest of the team.
1111
push:
12-
branches: [ 'ci-gha**', 'prepare-for-v3.0.0' ]
12+
branches: [ 'ci-gha**', 'main' ]
1313
# Start the build in the context of the target branch. This is considered
1414
# "safe", as the workflow files are already committed. These types of builds
1515
# have access to the secrets in the build, which we need to use the remote
@@ -30,19 +30,6 @@ concurrency:
3030
cancel-in-progress: true
3131

3232
jobs:
33-
debug:
34-
name: debug_job
35-
runs-on: ubuntu-latest
36-
steps:
37-
- name: debug_steps
38-
id: debug-steps
39-
run: |
40-
echo "event=${{ github.event_name }}"
41-
echo "assoc=${{ github.event.pull_request.author_association }}"
42-
echo "org=${{ github.organization }}" || true
43-
echo "user=${{ github.event.pull_request.user }}" || true
44-
echo "user_orgs=${{ github.event.pull_request.user.organizations_url }}" || true
45-
4633
pre-flight:
4734
# Save the `ref` of the pull request, so downstream jobs know what to checkout.
4835
environment: >-
@@ -51,7 +38,6 @@ jobs:
5138
(github.event.pull_request.head.repo.full_name == github.repository && 'internal')
5239
}}
5340
name: Save PR ref
54-
needs: [debug]
5541
if: >-
5642
${{
5743
((github.event.pull_request.author_association == 'OWNER' ||
@@ -120,6 +106,8 @@ jobs:
120106
execute-integration-tests: true
121107
secrets: inherit
122108
windows-cmake:
109+
# Disabled
110+
if: false
123111
name: Windows-CMake
124112
needs: [pre-flight]
125113
uses: ./.github/workflows/windows-cmake.yml

.github/workflows/windows-bazel.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,11 @@ jobs:
7070
# Using a short name like this avoids the problem in most cases.
7171
mkdir -p 'c:\b' || true
7272
export BAZEL_ROOT='c:\b'
73-
export BAZEL_REMOTE_CACHE_RW_MODE=${{ inputs.bazel-cache-mode }}
73+
export BAZEL_REMOTE_CACHE_RW_MODE=${INPUTS_BAZEL_CACHE_MODE}
7474
export EXECUTE_INTEGRATION_TESTS=${{ inputs.execute-integration-tests }}
7575
ci/gha/builds/windows-bazel.sh ${{ matrix.compilation_mode }} ${{ join(matrix.targets, ' ') }}
76+
env:
77+
INPUTS_BAZEL_CACHE_MODE: ${{ inputs.bazel-cache-mode }}
7678
- name: Post Build Disk Space
7779
shell: bash
7880
run: df -m

0 commit comments

Comments
 (0)