Skip to content
This repository was archived by the owner on Dec 3, 2023. It is now read-only.

Commit 0b393cd

Browse files
authored
Merge branch 'master' into renovate/google.common-protos.version
2 parents 78056ba + a40c71a commit 0b393cd

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

.kokoro/readme.sh

+10-1
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,18 @@ echo "https://${GITHUB_TOKEN}:@github.com" >> ~/.git-credentials
2828
git config --global credential.helper 'store --file ~/.git-credentials'
2929

3030
python3.6 -m pip install git+https://github.com/googleapis/synthtool.git#egg=gcp-synthtool
31+
32+
set +e
3133
python3.6 -m autosynth.synth \
3234
--repository=googleapis/java-core \
3335
--synth-file-name=.github/readme/synth.py \
3436
--metadata-path=.github/readme/synth.metadata \
3537
--pr-title="chore: regenerate README" \
36-
--branch-suffix="readme"
38+
--branch-suffix="readme"
39+
40+
# autosynth returns 28 to signal there are no changes
41+
RETURN_CODE=$?
42+
if [[ ${RETURN_CODE} -ne 0 && ${RETURN_CODE} -ne 28 ]]
43+
then
44+
exit ${RETURN_CODE}
45+
fi

.kokoro/release/publish_javadoc.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env_vars: {
99

1010
env_vars: {
1111
key: "STAGING_BUCKET_V2"
12-
value: "docs-staging-v2-staging"
12+
value: "docs-staging-v2"
1313
# Production will be at: docs-staging-v2
1414
}
1515

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,10 @@
154154
<gax.version>1.60.0</gax.version>
155155
<google.api-common.version>1.10.1</google.api-common.version>
156156
<google.common-protos.version>2.0.1</google.common-protos.version>
157-
<google.iam.version>1.0.2</google.iam.version>
157+
<google.iam.version>1.0.3</google.iam.version>
158158
<google.auth.version>0.22.0</google.auth.version>
159159
<google.api.version>1.30.11</google.api.version>
160-
<google.http.version>1.37.0</google.http.version>
160+
<google.http.version>1.38.0</google.http.version>
161161
<grpc.version>1.33.0</grpc.version>
162162
<protobuf.version>3.13.0</protobuf.version>
163163
<opencensus.version>0.24.0</opencensus.version>

synth.metadata

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
"git": {
55
"name": ".",
66
"remote": "https://github.com/googleapis/java-core.git",
7-
"sha": "54924f51efee095dee7f94267a1a436facc4761e"
7+
"sha": "4ff835d66de0f7d6d6cc4ab912ea707911731c60"
88
}
99
},
1010
{
1111
"git": {
1212
"name": "synthtool",
1313
"remote": "https://github.com/googleapis/synthtool.git",
14-
"sha": "b19b401571e77192f8dd38eab5fb2300a0de9324"
14+
"sha": "7db8a6c5ffb12a6e4c2f799c18f00f7f3d60e279"
1515
}
1616
}
1717
],

0 commit comments

Comments
 (0)