Merge 423a9eb into 1a41924

yoshi-automation · web-flow · commit 99aee28a39fa · 2021-02-17T01:36:53.000-08:00
diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
@@ -4,7 +4,7 @@ name: auto-release
 jobs:
   approve:
     runs-on: ubuntu-latest
-    if: contains(github.head_ref, 'release-v')
+    if: contains(github.head_ref, 'release-please')
     steps:
     - uses: actions/github-script@v3
       with:
@@ -16,7 +16,7 @@ jobs:
             return;
           }
 
-          // only approve PRs like "chore: release <release version>"
+          // only approve PRs like "chore(master): release <release version>"
           if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) {
             return;
           }
diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg
@@ -7,10 +7,10 @@ env_vars: {
   value: "docs-staging"
 }
 
+# cloud-rad staging
 env_vars: {
   key: "STAGING_BUCKET_V2"
-  value: "docs-staging-v2"
-  # Production will be at: docs-staging-v2
+  value: "docs-staging-v2-staging"
 }
 
 env_vars: {
diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
@@ -71,7 +71,7 @@ python3 -m docuploader create-metadata \
   --version ${VERSION} \
   --language java
 
-# upload docs
+# upload docs to staging bucket
 python3 -m docuploader upload . \
   --credentials ${CREDENTIALS} \
   --staging-bucket ${STAGING_BUCKET_V2}
diff --git a/.kokoro/release/publish_javadoc11.cfg b/.kokoro/release/publish_javadoc11.cfg
@@ -1,9 +1,9 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
+# cloud-rad production
 env_vars: {
   key: "STAGING_BUCKET_V2"
   value: "docs-staging-v2"
-  # Production will be at: docs-staging-v2
 }
 
 # Configure the docker image for kokoro-trampoline
diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
@@ -48,7 +48,7 @@ python3 -m docuploader create-metadata \
  --version ${VERSION} \
  --language java
 
-# upload yml
+# upload yml to production bucket
 python3 -m docuploader upload . \
  --credentials ${CREDENTIALS} \
  --staging-bucket ${STAGING_BUCKET_V2} \
diff --git a/synth.metadata b/synth.metadata
@@ -4,14 +4,14 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-bigquery.git",
-        "sha": "aa716bc9dac89c429341a302c7c52a698a4c9938"
+        "sha": "1a41924fcb906c1f5ebd62089237f63392b002ef"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "f327d3b657a63ae4a8efd7f011a15eacae36b59c"
+        "sha": "b416a7befcdbc42de41cf387dcf428f894fb812b"
       }
     }
   ],

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,10 @@ env_vars: {`
`7`	`7`	`value: "docs-staging"`
`8`	`8`	`}`
`9`	`9`
	`10`	`+# cloud-rad staging`
`10`	`11`	`env_vars: {`
`11`	`12`	`key: "STAGING_BUCKET_V2"`
`12`		`- value: "docs-staging-v2"`
`13`		`- # Production will be at: docs-staging-v2`
	`13`	`+ value: "docs-staging-v2-staging"`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`env_vars: {`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`# Format: //devtools/kokoro/config/proto/build.proto`
`2`	`2`
	`3`	`+# cloud-rad production`
`3`	`4`	`env_vars: {`
`4`	`5`	`key: "STAGING_BUCKET_V2"`
`5`	`6`	`value: "docs-staging-v2"`
`6`		`- # Production will be at: docs-staging-v2`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`# Configure the docker image for kokoro-trampoline`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@`
`4`	`4`	`"git": {`
`5`	`5`	`"name": ".",`
`6`	`6`	`"remote": "https://github.com/googleapis/java-bigquery.git",`
`7`		`- "sha": "aa716bc9dac89c429341a302c7c52a698a4c9938"`
	`7`	`+ "sha": "1a41924fcb906c1f5ebd62089237f63392b002ef"`
`8`	`8`	`}`
`9`	`9`	`},`
`10`	`10`	`{`
`11`	`11`	`"git": {`
`12`	`12`	`"name": "synthtool",`
`13`	`13`	`"remote": "https://github.com/googleapis/synthtool.git",`
`14`		`- "sha": "f327d3b657a63ae4a8efd7f011a15eacae36b59c"`
	`14`	`+ "sha": "b416a7befcdbc42de41cf387dcf428f894fb812b"`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`],`