Skip to content

Commit c34c321

Browse files
chore: update common templates
1 parent 4699595 commit c34c321

File tree

3 files changed

+49
-17
lines changed

3 files changed

+49
-17
lines changed

.kokoro/build.sh

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,24 @@ if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTI
3737
export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS})
3838
fi
3939

40+
RETURN_CODE=0
41+
set +e
42+
4043
case ${JOB_TYPE} in
4144
test)
4245
mvn test -B -Dclirr.skip=true -Denforcer.skip=true
46+
RETURN_CODE=$?
4347
bash ${KOKORO_GFILE_DIR}/codecov.sh
44-
bash .kokoro/coerce_logs.sh
4548
;;
4649
lint)
4750
mvn \
4851
-Penable-samples \
4952
com.coveo:fmt-maven-plugin:check
53+
RETURN_CODE=$?
5054
;;
5155
javadoc)
5256
mvn javadoc:javadoc javadoc:test-javadoc
57+
RETURN_CODE=$?
5358
;;
5459
integration)
5560
mvn -B ${INTEGRATION_TEST_ARGS} \
@@ -59,21 +64,41 @@ integration)
5964
-Denforcer.skip=true \
6065
-fae \
6166
verify
62-
bash .kokoro/coerce_logs.sh
67+
RETURN_CODE=$?
6368
;;
6469
samples)
65-
mvn -B \
66-
-Penable-samples \
67-
-DtrimStackTrace=false \
68-
-Dclirr.skip=true \
69-
-Denforcer.skip=true \
70-
-fae \
71-
verify
72-
bash .kokoro/coerce_logs.sh
70+
if [[ -f samples/pom.xml ]]
71+
then
72+
pushd samples
73+
mvn -B \
74+
-Penable-samples \
75+
-DtrimStackTrace=false \
76+
-Dclirr.skip=true \
77+
-Denforcer.skip=true \
78+
-fae \
79+
verify
80+
RETURN_CODE=$?
81+
popd
82+
else
83+
echo "no sample pom.xml found - skipping sample tests"
84+
fi
7385
;;
7486
clirr)
7587
mvn -B -Denforcer.skip=true clirr:check
88+
RETURN_CODE=$?
7689
;;
7790
*)
7891
;;
7992
esac
93+
94+
# fix output location of logs
95+
bash .kokoro/coerce_logs.sh
96+
97+
if [[ "${ENABLE_BUILD_COP}" == "true" ]]
98+
then
99+
chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/buildcop
100+
${KOKORO_GFILE_DIR}/linux_amd64/buildcop -repo=googleapis/java-spanner
101+
fi
102+
103+
echo "exiting with ${RETURN_CODE}"
104+
exit ${RETURN_CODE}

renovate.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,13 @@
5454
"semanticCommitType": "build",
5555
"semanticCommitScope": "deps"
5656
},
57+
{
58+
"packagePatterns": [
59+
"^com.google.cloud:libraries-bom"
60+
],
61+
"semanticCommitType": "chore",
62+
"semanticCommitScope": "deps"
63+
},
5764
{
5865
"packagePatterns": [
5966
"^com.google.cloud:google-cloud-"

synth.metadata

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
2-
"updateTime": "2020-02-21T10:02:56.715520Z",
2+
"updateTime": "2020-02-22T10:06:14.024281Z",
33
"sources": [
44
{
55
"generator": {
66
"name": "artman",
7-
"version": "0.45.0",
8-
"dockerImage": "googleapis/artman@sha256:6aec9c34db0e4be221cdaf6faba27bdc07cfea846808b3d3b964dfce3a9a0f9b"
7+
"version": "0.45.1",
8+
"dockerImage": "googleapis/artman@sha256:36956ca6a4dc70a59de5d5d0fd35061b050bb56884516f0898f46d8220f25738"
99
}
1010
},
1111
{
1212
"git": {
1313
"name": ".",
1414
"remote": "https://github.com/googleapis/java-spanner.git",
15-
"sha": "26a3eff44c7d1f36541440aa7d29fc1d3ae8a4d7"
15+
"sha": "4699595fd25d7995777a328887a24317aeae3868"
1616
}
1717
},
1818
{
1919
"git": {
2020
"name": "googleapis",
2121
"remote": "https://github.com/googleapis/googleapis.git",
22-
"sha": "e5bc9566ae057fb4c92f8b7e047f1c8958235b53",
23-
"internalRef": "296357191",
24-
"log": "e5bc9566ae057fb4c92f8b7e047f1c8958235b53\nDeprecate the endpoint_uris field, as it is unused.\n\nPiperOrigin-RevId: 296357191\n\n8c12e2b4dca94e12bff9f538bdac29524ff7ef7a\nUpdate Dataproc v1 client.\n\nPiperOrigin-RevId: 296336662\n\n17567c4a1ef0a9b50faa87024d66f8acbb561089\nRemoving erroneous comment, a la https://github.com/googleapis/java-speech/pull/103\n\nPiperOrigin-RevId: 296332968\n\n3eaaaf8626ce5b0c0bc7eee05e143beffa373b01\nAdd BUILD.bazel for v1 secretmanager.googleapis.com\n\nPiperOrigin-RevId: 296274723\n\ne76149c3d992337f85eeb45643106aacae7ede82\nMove securitycenter v1 to use generate from annotations.\n\nPiperOrigin-RevId: 296266862\n\n203740c78ac69ee07c3bf6be7408048751f618f8\nAdd StackdriverLoggingConfig field to Cloud Tasks v2 API.\n\nPiperOrigin-RevId: 296256388\n\ne4117d5e9ed8bbca28da4a60a94947ca51cb2083\nCreate a Bazel BUILD file for the google.actions.type export.\n\nPiperOrigin-RevId: 296212567\n\na9639a0a9854fd6e1be08bba1ac3897f4f16cb2f\nAdd secretmanager.googleapis.com v1 protos\n\nPiperOrigin-RevId: 295983266\n\nce4f4c21d9dd2bfab18873a80449b9d9851efde8\nasset: v1p1beta1 remove SearchResources and SearchIamPolicies\n\nPiperOrigin-RevId: 295861722\n\ncb61d6c2d070b589980c779b68ffca617f789116\nasset: v1p1beta1 remove SearchResources and SearchIamPolicies\n\nPiperOrigin-RevId: 295855449\n\nab2685d8d3a0e191dc8aef83df36773c07cb3d06\nfix: Dataproc v1 - AutoscalingPolicy annotation\n\nThis adds the second resource name pattern to the\nAutoscalingPolicy resource.\n\nCommitter: @lukesneeringer\nPiperOrigin-RevId: 295738415\n\n8a1020bf6828f6e3c84c3014f2c51cb62b739140\nUpdate cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 295286165\n\n5cfa105206e77670369e4b2225597386aba32985\nAdd service control related proto build rule.\n\nPiperOrigin-RevId: 295262088\n\nee4dddf805072004ab19ac94df2ce669046eec26\nmonitoring v3: Add prefix \"https://cloud.google.com/\" into the link for global access\ncl 295167522, get ride of synth.py hacks\n\nPiperOrigin-RevId: 295238095\n\nd9835e922ea79eed8497db270d2f9f85099a519c\nUpdate some minor docs changes about user event proto\n\nPiperOrigin-RevId: 295185610\n\n5f311e416e69c170243de722023b22f3df89ec1c\nfix: use correct PHP package name in gapic configuration\n\nPiperOrigin-RevId: 295161330\n\n6cdd74dcdb071694da6a6b5a206e3a320b62dd11\npubsub: v1 add client config annotations and retry config\n\nPiperOrigin-RevId: 295158776\n\n5169f46d9f792e2934d9fa25c36d0515b4fd0024\nAdded cloud asset api v1p4beta1.\n\nPiperOrigin-RevId: 295026522\n\n56b55aa8818cd0a532a7d779f6ef337ba809ccbd\nFix: Resource annotations for CreateTimeSeriesRequest and ListTimeSeriesRequest should refer to valid resources. TimeSeries is not a named resource.\n\nPiperOrigin-RevId: 294931650\n\n0646bc775203077226c2c34d3e4d50cc4ec53660\nRemove unnecessary languages from bigquery-related artman configuration files.\n\nPiperOrigin-RevId: 294809380\n\n8b78aa04382e3d4147112ad6d344666771bb1909\nUpdate backend.proto for schemes and protocol\n\nPiperOrigin-RevId: 294788800\n\n80b8f8b3de2359831295e24e5238641a38d8488f\nAdds artman config files for bigquerystorage endpoints v1beta2, v1alpha2, v1\n\nPiperOrigin-RevId: 294763931\n\n2c17ac33b226194041155bb5340c3f34733f1b3a\nAdd parameter to sample generated for UpdateInstance. Related to https://github.com/googleapis/python-redis/issues/4\n\nPiperOrigin-RevId: 294734008\n\nd5e8a8953f2acdfe96fb15e85eb2f33739623957\nMove bigquery datatransfer to gapic v2.\n\nPiperOrigin-RevId: 294703703\n\nefd36705972cfcd7d00ab4c6dfa1135bafacd4ae\nfix: Add two annotations that we missed.\n\nPiperOrigin-RevId: 294664231\n\n8a36b928873ff9c05b43859b9d4ea14cd205df57\nFix: Define the \"bigquery.googleapis.com/Table\" resource in the BigQuery Storage API (v1beta2).\n\nPiperOrigin-RevId: 294459768\n\nc7a3caa2c40c49f034a3c11079dd90eb24987047\nFix: Define the \"bigquery.googleapis.com/Table\" resource in the BigQuery Storage API (v1).\n\nPiperOrigin-RevId: 294456889\n\n5006247aa157e59118833658084345ee59af7c09\nFix: Make deprecated fields optional\nFix: Deprecate SetLoggingServiceRequest.zone in line with the comments\nFeature: Add resource name method signatures where appropriate\n\nPiperOrigin-RevId: 294383128\n\neabba40dac05c5cbe0fca3a35761b17e372036c4\nFix: C# and PHP package/namespace capitalization for BigQuery Storage v1.\n\nPiperOrigin-RevId: 294382444\n\nf8d9a858a7a55eba8009a23aa3f5cc5fe5e88dde\nfix: artman configuration file for bigtable-admin\n\nPiperOrigin-RevId: 294322616\n\n0f29555d1cfcf96add5c0b16b089235afbe9b1a9\nAPI definition for (not-yet-launched) GCS gRPC.\n\nPiperOrigin-RevId: 294321472\n\nfcc86bee0e84dc11e9abbff8d7c3529c0626f390\nfix: Bigtable Admin v2\n\nChange LRO metadata from PartialUpdateInstanceMetadata\nto UpdateInstanceMetadata. (Otherwise, it will not build.)\n\nPiperOrigin-RevId: 294264582\n\n6d9361eae2ebb3f42d8c7ce5baf4bab966fee7c0\nrefactor: Add annotations to Bigtable Admin v2.\n\nPiperOrigin-RevId: 294243406\n\nad7616f3fc8e123451c8b3a7987bc91cea9e6913\nFix: Resource type in CreateLogMetricRequest should use logging.googleapis.com.\nFix: ListLogEntries should have a method signature for convenience of calling it.\n\nPiperOrigin-RevId: 294222165\n\n63796fcbb08712676069e20a3e455c9f7aa21026\nFix: Remove extraneous resource definition for cloudkms.googleapis.com/CryptoKey.\n\nPiperOrigin-RevId: 294176658\n\n"
22+
"sha": "7f910bcc4fc4704947ccfd3ceed015d16b9e00c2",
23+
"internalRef": "296451205",
24+
"log": "7f910bcc4fc4704947ccfd3ceed015d16b9e00c2\nUpdate Dataproc v1beta2 client.\n\nPiperOrigin-RevId: 296451205\n\nde287524405a3dce124d301634731584fc0432d7\nFix: Reinstate method signatures that had been missed off some RPCs\nFix: Correct resource types for two fields\n\nPiperOrigin-RevId: 296435091\n\n"
2525
}
2626
},
2727
{

0 commit comments

Comments
 (0)