Skip to content

Commit cddc5fd

Browse files
authored
Update update-master-from-release.yml to only update SNAPSHOT version if we're not already on a SNAPSHOT version. (aws#2720)
1 parent 54c6324 commit cddc5fd

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

buildspecs/update-master-from-release.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,16 @@ phases:
3131
- git checkout master
3232
- git merge public/release --no-edit
3333
-
34-
- mvn versions:set -DnewVersion=$NEW_VERSION_SNAPSHOT -DgenerateBackupPoms=false -DprocessAllModules=true
35-
- sed -i -E "s/(<version>).+(<\/version>)/\1$RELEASE_VERSION\2/" README.md
36-
- sed -i -E "s/(<awsjavasdk.previous.version>).+(<\/awsjavasdk.previous.version>)/\1$RELEASE_VERSION\2/" pom.xml
37-
-
38-
- 'git commit -am "Update to next snapshot version: $NEW_VERSION_SNAPSHOT"'
34+
- MASTER_VERSION=`mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec`
35+
- echo "Master version - $MASTER_VERSION"
36+
- |
37+
if [ "$MASTER_VERSION" != "$NEW_VERSION_SNAPSHOT" ]; then
38+
39+
mvn versions:set -DnewVersion=$NEW_VERSION_SNAPSHOT -DgenerateBackupPoms=false -DprocessAllModules=true
40+
sed -i -E "s/(<version>).+(<\/version>)/\1$RELEASE_VERSION\2/" README.md
41+
sed -i -E "s/(<awsjavasdk.previous.version>).+(<\/awsjavasdk.previous.version>)/\1$RELEASE_VERSION\2/" pom.xml
42+
43+
git commit -am "Update to next snapshot version: $NEW_VERSION_SNAPSHOT"
44+
fi
3945
-
4046
- git push

0 commit comments

Comments
 (0)