Skip to content

Commit b0425ae

Browse files
chingor13chingor13
authored
---
yaml --- r: 35445 b: refs/heads/pubsub-ordering-keys c: d748c2c h: refs/heads/master i: 35443: ed65d05
1 parent 9e48ac6 commit b0425ae

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
@@ -155,7 +155,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
155155
refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
156156
refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
157157
refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
158-
refs/heads/pubsub-ordering-keys: ed1778c499740f03551d604d0e2ef5bb27dc9268
158+
refs/heads/pubsub-ordering-keys: d748c2c6a5f0ee22cac2e3261ef7b69311f0098e
159159
refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
160160
refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
161161
refs/tags/v0.77.0: 28a85a77883ccf5d48f297fd0ef3b3dca6ce01f0

‎branches/pubsub-ordering-keys/.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/pubsub-ordering-keys/.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/pubsub-ordering-keys/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/pubsub-ordering-keys/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)