From 46d6d6f0e5fd97acbdbe37fbe8b2beca9a4c4493 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Wed, 14 Apr 2021 15:59:45 -0700 Subject: [PATCH] fix: release scripts from issuing overlapping phases `mvn deploy` will run `mvn install` so specifying `mvn install deploy` is redundant at best. At worst, it will cause plugins like maven-shade-plugin to be executed twice re-shading itself Source-Author: Igor Bernstein Source-Date: Wed Apr 14 13:16:03 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d Source-Link: https://github.com/googleapis/synthtool/commit/8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d --- .kokoro/release/snapshot.sh | 2 +- .kokoro/release/stage.sh | 2 +- synth.metadata | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh index 098168a7..1f55b770 100755 --- a/.kokoro/release/snapshot.sh +++ b/.kokoro/release/snapshot.sh @@ -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 \ diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 16126d2e..8a103384 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -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 \ diff --git a/synth.metadata b/synth.metadata index b4a4b1bd..2589f9c4 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-workflows.git", - "sha": "6c23e3359094a5e944b06307ca1699326f89d64c" + "sha": "24ce2a38d23b772adb5de150d6df4e9160545bd4" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "082e1ca0863b13ada8594fe91845380765da5b70" + "sha": "8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d" } } ],