Skip to content

Commit f91f91f

Browse files
cuiy0006cuiy0006
authored
Merge branch 'main' into add-tracing-connection
2 parents af0ac8f + 20266d6 commit f91f91f

24 files changed

+79
-387
lines changed

‎.github/workflows/macos-bazel.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,5 +210,5 @@ jobs:
210210
- name: Post Tests Disk Space
211211
run: df -m
212212
env:
213-
BAZEL_REMOTE_CACHE: https://storage.googleapis.com/cloud-cpp-community-gha-cache/bazel-cache/${{ matrix.os }}
213+
BAZEL_REMOTE_CACHE: https://storage.googleapis.com/cloud-cpp-community-gha-cache/bigquery-bazel-cache/${{ matrix.os }}
214214
GHA_TEST_BUCKET: "gcs-grpc-team-cloud-cpp-testing-bucket"

‎.github/workflows/macos-cmake.yml‎

Lines changed: 5 additions & 174 deletions
Original file line numberDiff line numberDiff line change
@@ -64,177 +64,8 @@ jobs:
6464
echo "vcpkg-version=$(cat ci/etc/vcpkg-version.txt)" >> "${GITHUB_OUTPUT}"
6565
all_features=(bigquery_unified)
6666
echo "features=${features:1}" >> "${GITHUB_OUTPUT}"
67-
#
68-
# core1_features=(
69-
# bigtable
70-
# spanner
71-
# )
72-
# core2_features=(
73-
# pubsub
74-
# pubsublite
75-
# storage
76-
# storage_grpc
77-
# )
78-
# # These are the libraries with the most "clients". To build the list
79-
# # run something like this and find the midpoint:
80-
# #
81-
# # git grep -l 'class.*Client' 'google/cloud/**_client.h' |
82-
# # egrep -v "(bigtable/|internal/|pubsub/|pubsublite/|spanner/|storage/|testing_util/)" |
83-
# # cut -f -3 -d/| sort | uniq -c | sort -n |
84-
# # awk '{ s += $1; print s, $0}'
85-
# #
86-
# shard1_features=(
87-
# dataproc
88-
# monitoring
89-
# retail
90-
# discoveryengine
91-
# )
92-
# shard2_features=(
93-
# servicecontrol
94-
# speech
95-
# support
96-
# video
97-
# datacatalog
98-
# iam
99-
# run
100-
# talent
101-
# contentwarehouse
102-
# dataplex
103-
# kms
104-
# bigquery
105-
# resourcemanager
106-
# appengine
107-
# )
108-
# shard3_features=(
109-
# channel
110-
# cloudbuild
111-
# cloudcontrolspartner
112-
# composer
113-
# containeranalysis
114-
# datastore
115-
# eventarc
116-
# functions
117-
# iap
118-
# language
119-
# metastore
120-
# networkconnectivity
121-
# networkservices
122-
# policytroubleshooter
123-
# profiler
124-
# redis
125-
# securitycenter
126-
# servicedirectory
127-
# tpu
128-
# trace
129-
# vision
130-
# workflows
131-
# beyondcorp
132-
# billing
133-
# binaryauthorization
134-
# gkemulticloud
135-
# logging
136-
# notebooks
137-
# osconfig
138-
# )
139-
# shard4_features=(
140-
# domains
141-
# edgecontainer
142-
# edgenetwork
143-
# essentialcontacts
144-
# filestore
145-
# ids
146-
# managedidentities
147-
# managedkafka
148-
# memcache
149-
# migrationcenter
150-
# netapp
151-
# networkmanagement
152-
# networksecurity
153-
# optimization
154-
# orgpolicy
155-
# oslogin
156-
# policysimulator
157-
# privateca
158-
# privilegedaccessmanager
159-
# publicca
160-
# rapidmigrationassessment
161-
# recaptchaenterprise
162-
# recommender
163-
# resourcesettings
164-
# scheduler
165-
# secretmanager
166-
# securesourcemanager
167-
# securitycentermanagement
168-
# servicehealth
169-
# servicemanagement
170-
# serviceusage
171-
# shell
172-
# storagecontrol
173-
# storageinsights
174-
# storagetransfer
175-
# tasks
176-
# telcoautomation
177-
# texttospeech
178-
# timeseriesinsights
179-
# translate
180-
# videointelligence
181-
# vmmigration
182-
# vmwareengine
183-
# vpcaccess
184-
# webrisk
185-
# websecurityscanner
186-
# workstations
187-
# automl
188-
# )
189-
# shard5_features=(
190-
# bigquerycontrol
191-
# dialogflow_cx
192-
# dialogflow_es
193-
# gkebackup
194-
# gkeconnect
195-
# gkehub
196-
# sql
197-
# )
198-
# if [[ "${{ matrix.shard }}" == "Core1" ]]; then
199-
# features="$(printf ",%s" "${core1_features[@]}")"
200-
# echo "features=${features:1}" >> "${GITHUB_OUTPUT}"
201-
# elif [[ "${{ matrix.shard }}" == "Core2" ]]; then
202-
# features="$(printf ",%s" "${core2_features[@]}")"
203-
# echo "features=${features:1}" >> "${GITHUB_OUTPUT}"
204-
# elif [[ "${{matrix.shard}}" == "Compute" ]]; then
205-
# echo "features=compute" >> "${GITHUB_OUTPUT}"
206-
# elif [[ "${{matrix.shard}}" == "AIPlatform" ]]; then
207-
# echo "features=aiplatform" >> "${GITHUB_OUTPUT}"
208-
# elif [[ "${{ matrix.shard }}" == "Shard1" ]]; then
209-
# features="$(printf ",%s" "${shard1_features[@]}")"
210-
# echo "features=${features:1}" >> "${GITHUB_OUTPUT}"
211-
# elif [[ "${{ matrix.shard }}" == "Shard2" ]]; then
212-
# features="$(printf ",%s" "${shard2_features[@]}")"
213-
# echo "features=${features:1}" >> "${GITHUB_OUTPUT}"
214-
# elif [[ "${{ matrix.shard }}" == "Shard3" ]]; then
215-
# features="$(printf ",%s" "${shard3_features[@]}")"
216-
# echo "features=${features:1}" >> "${GITHUB_OUTPUT}"
217-
# elif [[ "${{ matrix.shard }}" == "Shard4" ]]; then
218-
# features="$(printf ",%s" "${shard4_features[@]}")"
219-
# echo "features=${features:1}" >> "${GITHUB_OUTPUT}"
220-
# elif [[ "${{ matrix.shard }}" == "Shard5" ]]; then
221-
# features="$(printf ",%s" "${shard5_features[@]}")"
222-
# echo "features=${features:1}" >> "${GITHUB_OUTPUT}"
223-
# else
224-
# skipped_features=("${core1_features[@]}")
225-
# skipped_features+=("${core2_features[@]}")
226-
# skipped_features+=(compute)
227-
# skipped_features+=(aiplatform)
228-
# skipped_features+=("${shard1_features[@]}")
229-
# skipped_features+=("${shard2_features[@]}")
230-
# skipped_features+=("${shard3_features[@]}")
231-
# skipped_features+=("${shard4_features[@]}")
232-
# skipped_features+=("${shard5_features[@]}")
233-
# skipped="$(printf ",-%s" "${skipped_features[@]}")"
234-
# echo "features=__ga_libraries__,__experimental_libraries__,${skipped:1}" >> "${GITHUB_OUTPUT}"
235-
# fi
236-
- name: Install bash >= 5.x and Ninja
237-
run: brew install bash ninja
67+
- name: Install bash >= 5.x, Ninja, and bison
68+
run: brew install bash ninja bison
23869
- name: Pre Tests Disk Space
23970
run: df -m
24071
- name: Install CMake==3.27.2
@@ -260,7 +91,7 @@ jobs:
26091
curl -fsSL "https://github.com/microsoft/vcpkg/archive/${{ steps.dynamic.outputs.vcpkg-version }}.tar.gz" |
26192
tar -C vcpkg --strip-components=1 -zxf -
26293
vcpkg/bootstrap-vcpkg.sh -disableMetrics
263-
- name: Build google-cloud-cpp
94+
- name: Build google-cloud-cpp-bigquery
26495
run: |
26596
export VCPKG_ROOT="${{ runner.temp }}/vcpkg"
26697
export EXECUTE_INTEGRATION_TESTS=${{ inputs.execute-integration-tests }}
@@ -269,8 +100,8 @@ jobs:
269100
run: df -m
270101
env:
271102
SCCACHE_GCS_BUCKET: cloud-cpp-community-gha-cache
272-
SCCACHE_GCS_KEY_PREFIX: sccache/${{ matrix.os }}
103+
SCCACHE_GCS_KEY_PREFIX: bigquery-sccache/${{ matrix.os }}
273104
SCCACHE_GCS_RW_MODE: ${{ inputs.sccache-mode }}
274105
SCCACHE_IGNORE_SERVER_IO_ERROR: 1
275-
VCPKG_BINARY_SOURCES: x-gcs,gs://cloud-cpp-community-gha-cache/vcpkg-cache/${{ matrix.os }},${{ inputs.vcpkg-cache-mode }}
106+
VCPKG_BINARY_SOURCES: x-gcs,gs://cloud-cpp-community-gha-cache/bigquery-vcpkg-cache/${{ matrix.os }},${{ inputs.vcpkg-cache-mode }}
276107
GHA_TEST_BUCKET: "gcs-grpc-team-cloud-cpp-testing-bucket"

‎.github/workflows/test-runner.yml‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -137,25 +137,27 @@ jobs:
137137
vcpkg-cache-mode: 'readwrite'
138138
execute-integration-tests: true
139139
secrets: inherit
140-
# windows-cmake:
141-
# name: Windows-CMake
142-
# needs: [pre-flight]
143-
# uses: ./.github/workflows/windows-cmake.yml
144-
# with:
145-
# checkout-ref: ${{ needs.pre-flight.outputs.checkout-sha }}
146-
# # Build the full matrix only on push events to the default branch, or
147-
# # when PR gets the has a `gha:full-build` label, or when it had the
148-
# # label already and it gets a new commit.
149-
# full-matrix: |-
150-
# ${{
151-
# github.event_name == 'schedule' ||
152-
# github.event_name == 'push' ||
153-
# contains(github.event.pull_request.labels.*.name, 'gha:full-build')
154-
# }}
155-
# sccache-mode: 'READ_WRITE'
156-
# vcpkg-cache-mode: 'readwrite'
157-
# execute-integration-tests: true
158-
# secrets: inherit
140+
windows-cmake:
141+
name: Windows-CMake
142+
needs: [pre-flight]
143+
uses: ./.github/workflows/windows-cmake.yml
144+
with:
145+
checkout-ref: ${{ needs.pre-flight.outputs.checkout-sha }}
146+
# Build the full matrix only on push events to the default branch, or
147+
# when PR gets the has a `gha:full-build` label, or when it had the
148+
# label already and it gets a new commit.
149+
full-matrix: |-
150+
${{
151+
github.event_name == 'schedule' ||
152+
github.event_name == 'push' ||
153+
contains(github.event.pull_request.labels.*.name, 'gha:full-build')
154+
}}
155+
# The current versions of sccache, cmake, ninja, and msvc result in a
156+
# combination that is incompatible. Dsiabling sccache for now.
157+
sccache-mode: 'DISABLED'
158+
vcpkg-cache-mode: 'readwrite'
159+
execute-integration-tests: true
160+
secrets: inherit
159161
notify:
160162
name: Notify-Google-Chat
161163
# Wait until all the other jobs have completed.

‎.github/workflows/windows-bazel.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,5 @@ jobs:
105105
shell: bash
106106
run: df -m
107107
env:
108-
BAZEL_REMOTE_CACHE: https://storage.googleapis.com/cloud-cpp-community-gha-cache/bazel-cache/${{ matrix.msvc }}/${{ matrix.compilation_mode }}
108+
BAZEL_REMOTE_CACHE: https://storage.googleapis.com/cloud-cpp-community-gha-cache/bigquery-bazel-cache/${{ matrix.msvc }}/${{ matrix.compilation_mode }}
109109
GHA_TEST_BUCKET: "gcs-grpc-team-cloud-cpp-testing-bucket"

0 commit comments

Comments
 (0)