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

fix: release scripts from issuing overlapping phases #332

Merged
merged 2 commits into from Apr 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .kokoro/build.sh
Expand Up @@ -37,7 +37,7 @@ retry_with_backoff 3 10 \
-Dgcloud.download.skip=true \
-T 1C

# if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it
# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it
if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then
export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS})
fi
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/release/snapshot.sh
Expand Up @@ -25,7 +25,7 @@ grep SNAPSHOT versions.txt
setup_environment_secrets
create_settings_xml_file "settings.xml"

mvn clean install deploy -B \
mvn clean deploy -B \
--settings ${MAVEN_SETTINGS_FILE} \
-DperformRelease=true \
-Dgpg.executable=gpg \
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/release/stage.sh
Expand Up @@ -29,7 +29,7 @@ create_settings_xml_file "settings.xml"

# attempt to stage 3 times with exponential backoff (starting with 10 seconds)
retry_with_backoff 3 10 \
mvn clean install deploy -B \
mvn clean deploy -B \
--settings ${MAVEN_SETTINGS_FILE} \
-DskipTests=true \
-DperformRelease=true \
Expand Down
5 changes: 3 additions & 2 deletions synth.metadata
Expand Up @@ -4,14 +4,14 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-shared-dependencies.git",
"sha": "265911945d03215a4a2f36e350f94ba60a25c59b"
"sha": "409d24f8a0cac30e41ca45eb2711aecb335d70dd"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
"sha": "5b0e1592dd7d70b485e157ea4b3eb1704ecbd015"
"sha": "8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d"
}
}
],
Expand All @@ -25,6 +25,7 @@
".github/generated-files-bot.yml",
".github/readme/synth.py",
".github/snippet-bot.yml",
".github/sync-repo-settings.yaml",
".github/trusted-contribution.yml",
".github/workflows/approve-readme.yaml",
".github/workflows/ci.yaml",
Expand Down