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

Commit 043ab3a

Browse files
chore: update common templates (#138)
* build(java): fix retry_with_backoff when -e option set (#475) googleapis/synthtool@bd69a2a commit bd69a2aa7b70875f3c988e269706b22fefbef40e Author: Jeff Ching <[email protected]> Date: Wed Apr 8 14:01:08 2020 -0700 build(java): fix retry_with_backoff when -e option set (#475) * build(java): fix nightly integration test config to run integrations (#465) googleapis/synthtool@c7e0e51 commit c7e0e517d7f46f77bebd27da2e5afcaa6eee7e25 Author: Jeff Ching <[email protected]> Date: Wed Apr 8 14:06:04 2020 -0700 build(java): fix nightly integration test config to run integrations (#465) This was only running the units. * chore(java): release-please only updates non maven versions in README (#476) googleapis/synthtool@7f8e62a commit 7f8e62aa3edd225f76347a16f92e400661fdfb52 Author: Jeff Ching <[email protected]> Date: Wed Apr 8 14:14:25 2020 -0700 chore(java): release-please only updates non maven versions in README (#476) Prevent release-please and synthtool from fighting over the released library version. Synthtool updates the install snippets from the samples pom.xml files so the bots fight if they are temporarily out of sync after a release.
1 parent 7160192 commit 043ab3a

File tree

4 files changed

+32
-6
lines changed

4 files changed

+32
-6
lines changed

.kokoro/common.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,28 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
# set -eo pipefail
17-
1816
function retry_with_backoff {
1917
attempts_left=$1
2018
sleep_seconds=$2
2119
shift 2
2220
command=$@
2321

22+
23+
# store current flag state
24+
flags=$-
25+
26+
# allow a failures to continue
27+
set +e
2428
echo "${command}"
2529
${command}
2630
exit_code=$?
2731

32+
# restore "e" flag
33+
if [[ ${flags} =~ e ]]
34+
then set -e
35+
else set +e
36+
fi
37+
2838
if [[ $exit_code == 0 ]]
2939
then
3040
return 0

.kokoro/nightly/integration.cfg

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,26 @@ env_vars: {
66
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
77
}
88

9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "integration"
12+
}
13+
14+
env_vars: {
15+
key: "GCLOUD_PROJECT"
16+
value: "gcloud-devel"
17+
}
18+
919
env_vars: {
1020
key: "ENABLE_BUILD_COP"
1121
value: "true"
1222
}
1323

24+
env_vars: {
25+
key: "GOOGLE_APPLICATION_CREDENTIALS"
26+
value: "keystore/73713_java_it_service_account"
27+
}
28+
1429
before_action {
1530
fetch_keystore {
1631
keystore_resource {

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
3535

3636
```
3737

38-
[//]: # ({x-version-update-start:google-cloud-dataproc:released})
39-
4038
If you are using Maven without BOM, add this to your dependencies:
4139

4240
```xml
@@ -48,6 +46,8 @@ If you are using Maven without BOM, add this to your dependencies:
4846

4947
```
5048

49+
[//]: # ({x-version-update-start:google-cloud-dataproc:released})
50+
5151
If you are using Gradle, add this to your dependencies
5252
```Groovy
5353
compile 'com.google.cloud:google-cloud-dataproc:0.121.0'

synth.metadata

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"updateTime": "2020-04-08T23:43:44.331357Z",
2+
"updateTime": "2020-04-09T09:42:59.462366Z",
33
"sources": [
44
{
55
"git": {
@@ -28,7 +28,8 @@
2828
"git": {
2929
"name": "synthtool",
3030
"remote": "https://github.com/googleapis/synthtool.git",
31-
"sha": "a003d8655d3ebec2bbbd5fc3898e91e152265c67"
31+
"sha": "7f8e62aa3edd225f76347a16f92e400661fdfb52",
32+
"log": "7f8e62aa3edd225f76347a16f92e400661fdfb52\nchore(java): release-please only updates non maven versions in README (#476)\n\nPrevent release-please and synthtool from fighting over the released library version. Synthtool updates the install snippets from the samples pom.xml files so the bots fight if they are temporarily out of sync after a release.\nc7e0e517d7f46f77bebd27da2e5afcaa6eee7e25\nbuild(java): fix nightly integration test config to run integrations (#465)\n\nThis was only running the units.\nbd69a2aa7b70875f3c988e269706b22fefbef40e\nbuild(java): fix retry_with_backoff when -e option set (#475)\n\n\nd9b173c427bfa0c6cca818233562e7e8841a357c\nfix: record version of working repo in synth.metadata (#473)\n\nPartial revert of b37cf74d12e9a42b9de9e61a4f26133d7cd9c168.\nf73a541770d95a609e5be6bf6b3b220d17cefcbe\nfeat(discogapic): allow local discovery-artifact-manager (#474)\n\n\n8cf0f5d93a70c3dcb0b4999d3152c46d4d9264bf\ndoc: describe the Autosynth & Synthtool protocol (#472)\n\n* doc: describe the Autosynth & Synthtool protocol\n\n* Accommodate review comments.\n980baaa738a1ad8fa02b4fdbd56be075ee77ece5\nfix: pin sphinx to <3.0.0 as new version causes new error (#471)\n\nThe error `toctree contains reference to document changlelog that doesn't have a title: no link will be generated` occurs as of 3.0.0. Pinning to 2.x until we address the docs build issue.\n\nTowards #470\n\nI did this manually for python-datastore https://github.com/googleapis/python-datastore/pull/22\n928b2998ac5023e7c7e254ab935f9ef022455aad\nchore(deps): update dependency com.google.cloud.samples:shared-configuration to v1.0.15 (#466)\n\nCo-authored-by: Jeffrey Rennie <[email protected]>\n188f1b1d53181f739b98f8aa5d40cfe99eb90c47\nfix: allow local and external deps to be specified (#469)\n\nModify noxfile.py to allow local and external dependencies for\nsystem tests to be specified.\n1df68ed6735ddce6797d0f83641a731c3c3f75b4\nfix: apache license URL (#468)\n\n\nf4a59efa54808c4b958263de87bc666ce41e415f\nfeat: Add discogapic support for GAPICBazel generation (#459)\n\n* feat: Add discogapic support for GAPICBazel generation\n\n* reformat with black\n\n* Rename source repository variable\n\nCo-authored-by: Jeffrey Rennie <[email protected]>\n99820243d348191bc9c634f2b48ddf65096285ed\nfix: update template files for Node.js libraries (#463)\n\n\n3cbe6bcd5623139ac9834c43818424ddca5430cb\nfix(ruby): remove dead troubleshooting link from generated auth guide (#462)\n\n\n"
3233
}
3334
}
3435
],

0 commit comments

Comments
 (0)