Skip to content

Commit 60fec2b

Browse files
fix: release scripts from issuing overlapping phases (#664)
This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/4cc16170-f25c-40e9-b087-19d1aca05ebd/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: googleapis/synthtool@8285c2b Source-Link: googleapis/synthtool@082e1ca Source-Link: googleapis/synthtool@5b0e159
1 parent c309e29 commit 60fec2b

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.kokoro/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ retry_with_backoff 3 10 \
3737
-Dgcloud.download.skip=true \
3838
-T 1C
3939

40-
# if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it
40+
# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it
4141
if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then
4242
export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS})
4343
fi

.kokoro/release/snapshot.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ grep SNAPSHOT versions.txt
2525
setup_environment_secrets
2626
create_settings_xml_file "settings.xml"
2727

28-
mvn clean install deploy -B \
28+
mvn clean deploy -B \
2929
--settings ${MAVEN_SETTINGS_FILE} \
3030
-DperformRelease=true \
3131
-Dgpg.executable=gpg \

.kokoro/release/stage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ create_settings_xml_file "settings.xml"
2929

3030
# attempt to stage 3 times with exponential backoff (starting with 10 seconds)
3131
retry_with_backoff 3 10 \
32-
mvn clean install deploy -B \
32+
mvn clean deploy -B \
3333
--settings ${MAVEN_SETTINGS_FILE} \
3434
-DskipTests=true \
3535
-DperformRelease=true \

synth.metadata

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
"git": {
55
"name": ".",
66
"remote": "https://github.com/googleapis/google-oauth-java-client.git",
7-
"sha": "f6d16c6d7becbd49158e703f1c0b94ce1981e625"
7+
"sha": "ff93258c8506ade94a356ed7e709ec256e08741c"
88
}
99
},
1010
{
1111
"git": {
1212
"name": "synthtool",
1313
"remote": "https://github.com/googleapis/synthtool.git",
14-
"sha": "572ef8f70edd9041f5bcfa71511aed6aecfc2098"
14+
"sha": "8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d"
1515
}
1616
}
1717
],
@@ -26,6 +26,7 @@
2626
".github/readme/synth.py",
2727
".github/release-please.yml",
2828
".github/snippet-bot.yml",
29+
".github/sync-repo-settings.yaml",
2930
".github/trusted-contribution.yml",
3031
".github/workflows/approve-readme.yaml",
3132
".github/workflows/auto-release.yaml",

0 commit comments

Comments
 (0)