Skip to content

Commit 0c27369

Browse files
chingor13chingor13
authored
---
yaml --- r: 32175 b: refs/heads/autosynth-dialogflow c: d748c2c h: refs/heads/master i: 32173: d4d264f 32171: 3ecc1d2 32167: f9ef67e 32159: 5e1b7ac
1 parent ee25f6f commit 0c27369

5 files changed

Lines changed: 50 additions & 48 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ refs/heads/autosynth-bigtable: 2a6af7e2959fd79c99b8ca5d773f29a6434b546d
128128
refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
129129
refs/heads/autosynth-containeranalysis: 18d210f81f17cf74864d0db2c29e834302f74f2a
130130
refs/heads/autosynth-datastore: f1efc3dc465174f41041acd56cf29badcec3e5bd
131-
refs/heads/autosynth-dialogflow: ed1778c499740f03551d604d0e2ef5bb27dc9268
131+
refs/heads/autosynth-dialogflow: d748c2c6a5f0ee22cac2e3261ef7b69311f0098e
132132
refs/heads/autosynth-errorreporting: 3f176c20b55dfaaa8fc32f28d82b31784b93e636
133133
refs/heads/autosynth-firestore: 983c75e4fb1076502c8cac73ef0538bdb10884f3
134134
refs/heads/autosynth-iot: 4025d1804241e74d54950a324dc4f667aeaad4b3

‎branches/autosynth-dialogflow/.kokoro/release/stage.cfg‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,33 @@ action {
1414
fail_if_no_artifacts: true
1515
}
1616
}
17+
18+
# Fetch the token needed for reporting release status to GitHub
19+
before_action {
20+
fetch_keystore {
21+
keystore_resource {
22+
keystore_config_id: 73713
23+
keyname: "yoshi-automation-github-key"
24+
}
25+
}
26+
}
27+
28+
# Fetch magictoken to use with Magic Github Proxy
29+
before_action {
30+
fetch_keystore {
31+
keystore_resource {
32+
keystore_config_id: 73713
33+
keyname: "releasetool-magictoken"
34+
}
35+
}
36+
}
37+
38+
# Fetch api key to use with Magic Github Proxy
39+
before_action {
40+
fetch_keystore {
41+
keystore_resource {
42+
keystore_config_id: 73713
43+
keyname: "magic-github-proxy-api-key"
44+
}
45+
}
46+
}

‎branches/autosynth-dialogflow/.kokoro/release/stage.sh‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,28 @@
1515

1616
set -eo pipefail
1717

18+
# Start the releasetool reporter
19+
python3 -m pip install gcp-releasetool
20+
python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
21+
1822
source $(dirname "$0")/common.sh
1923
MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml
2024
pushd $(dirname "$0")/../../
2125

2226
setup_environment_secrets
2327
create_settings_xml_file "settings.xml"
2428

29+
AUTORELEASE="false"
30+
if [[ -n "${AUTORELEASE_PR}" ]]
31+
then
32+
AUTORELEASE="true"
33+
fi
34+
2535
mvn clean deploy -B \
2636
-DskipTests=true \
2737
--settings ${MAVEN_SETTINGS_FILE} \
2838
-Dgpg.executable=gpg \
2939
-Dgpg.passphrase=${GPG_PASSPHRASE} \
3040
-Dgpg.homedir=${GPG_HOMEDIR} \
31-
-P release
41+
-P release \
42+
-Ddeploy.autorelease=${AUTORELEASE}

‎branches/autosynth-dialogflow/RELEASING.md‎

Lines changed: 5 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -19,55 +19,15 @@ need python 3.6+ to run this tool.
1919
3. Verify that all unit and integration tests for the last commit have passed.
2020

2121
4. Run `releasetool start`. Select "minor" or "patch" for the release type. This will bump the
22-
artifact versions, ask you to edit release notes, and create the release pull request.
22+
artifact versions, ask you to edit release notes, and create the release pull request. When
23+
prompted, select yes for autorelease.
2324

2425
**Note:** be sure to make these notes nice as they will be used for the release notes as well.
2526

26-
## Pushing a release to Maven using Kokoro
27+
5. When tests pass on the release PR and you have a review from a code owner, merge the release PR.
28+
This will trigger automation to stage and release google-cloud-java.
2729

28-
To manually publish the artifacts to Maven (rather than using Kokoro), you will need to follow the
29-
"Additional setup for manual publishing" steps below and follow the instructions in the
30-
"Manually publishing" section.
31-
32-
1. Trigger the `google-cloud-java/release/stage` Kokoro job and wait for it to complete. This will
33-
stage the built artifacts and prepare them for publishing.
34-
35-
2. Look through the logs for the `google-cloud-java/release/stage` and find the staging repository
36-
ids used. They will look like `comgoogleapi-XYZ` and `comgooglecloud-XYZ`.
37-
38-
3. Promote or drop the staged repository.
39-
40-
a. To publish the staged repository, trigger the `google-cloud-java/release/promote` Kokoro job for
41-
each staging repository. To specify the staging repository, add an environment variable
42-
configuration with `STAGING_REPOSITORY_ID=<staging repository id>` from the UI. **Note: thi
43-
will need to be run for each staging repository. It may take a few hours for the released
44-
versions to be available for users to download.**
45-
46-
b. To drop (abort) the staged repository, trigger the `google-cloud-java/release/drop` Kokoro job
47-
with the same staging repository id configuration as if you were publishing.
48-
49-
## Publish Javadoc
50-
51-
1. Run `git clean -x -f -d` to put the repo in a clean state.
52-
53-
2. Locally build the repo by running `mvn install -DskipTests`.
54-
55-
3. Run `python utilities/stage_sites.py`. This script checks out `gh-pages` branch of the
56-
repository, builds the documentation site and javadocs, copies them to the branch and commits it.
57-
This script does not push the docs and it must be done manually on the later step. The script
58-
assumes that there is no directory called `tmp_gh-pages` in the repository root. If it is
59-
present, remove it before running the script.
60-
61-
4. Run `cd tmp_gh-pages && git push && cd ..`.
62-
63-
5. (Optional) Run `rm -rf tmp_gh-pages` to remove the generated docs directory from your local
64-
machine.
65-
66-
## Tag the release
67-
68-
1. Run `releasetool tag` to publish a release on Github. It will list the last few merged PRs.
69-
Select the newly merged release PR. Releasetool will create the GitHub release with notes
70-
extracted from the pull request and tag the new release.
30+
6. After the artifacts have been pushed, automation will publish the javadocs to googleapis.dev
7131

7232
## Prepare the next snapshot version
7333

‎branches/autosynth-dialogflow/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
18+
<deploy.autorelease>false</deploy.autorelease>
1819
</properties>
1920
<developers>
2021
<developer>
@@ -96,7 +97,7 @@
9697
<configuration>
9798
<serverId>ossrh</serverId>
9899
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
99-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
100+
<autoReleaseAfterClose>${deploy.autorelease}</autoReleaseAfterClose>
100101
</configuration>
101102
</plugin>
102103
<plugin>

0 commit comments

Comments
 (0)