Skip to content

Commit ba0d51b

Browse files
authored
Merge branch 'main' into release-please--branches--main--components--firestore
2 parents 6f5d582 + 4e5752b commit ba0d51b

15 files changed

Lines changed: 65 additions & 1267 deletions

File tree

ci/run_conditional_tests.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,16 @@ for subdir in ${subdirs[@]}; do
113113
continue
114114
fi
115115

116+
# System tests for packages are broken and blocking PRs.
117+
# See https://github.com/googleapis/google-cloud-node/issues/7976.
118+
#
119+
# Per https://github.com/googleapis/google-cloud-node/issues/7921,
120+
# we are likely to permanently remove these tests in the near future.
121+
if [[ "${subdir}" == "packages" && "${TEST_TYPE}" == "system" ]]; then
122+
echo "Skipping ${TEST_TYPE} test for packages: ${d}"
123+
continue
124+
fi
125+
116126
# Our CI uses Git Bash on Windows to execute this script, which returns "msys" for OSTYPE.
117127
if [[ "$OSTYPE" == "msys" ]]; then
118128
if [[ "${windows_exempt_tests}" =~ "${d}" ]]; then

handwritten/spanner/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,13 @@
141141
"yargs": "^17.7.2"
142142
},
143143
"overrides": {
144-
"gcp-metadata": "^7.0.1"
144+
"gcp-metadata": "^7.0.1",
145+
"@sinonjs/fake-timers": "15.2.1"
145146
},
146147
"pnpm": {
147148
"overrides": {
148-
"gcp-metadata": "^7.0.1"
149+
"gcp-metadata": "^7.0.1",
150+
"@sinonjs/fake-timers": "15.2.1"
149151
}
150152
},
151153
"homepage": "https://github.com/googleapis/google-cloud-node/tree/main/handwritten/spanner"

packages/google-cloud-secretmanager/protos/google/cloud/secrets/v1beta1/resources.proto

Lines changed: 0 additions & 156 deletions
This file was deleted.

0 commit comments

Comments
 (0)