Skip to content

Commit a7076e3

Browse files
committed
Release script improvements
- create (annotated) tag with a message - avoid using tycho.mode
1 parent 454031c commit a7076e3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

do-release.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ echo "-------------------------------------------"
2323
echo "Releasing PMD Eclipse Plugin"
2424
echo "-------------------------------------------"
2525

26-
CURRENT_VERSION=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout -Dtycho.mode=maven)
26+
CURRENT_VERSION=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout)
2727
RELEASE_VERSION=${CURRENT_VERSION%-SNAPSHOT}
2828
MAJOR=$(echo "$RELEASE_VERSION" | cut -d . -f 1)
2929
MINOR=$(echo "$RELEASE_VERSION" | cut -d . -f 2)
@@ -76,9 +76,9 @@ echo "And also remove any empty/unnecessary sections"
7676
echo
7777
echo "Press enter to continue..."
7878
read -r
79-
./mvnw org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion="${RELEASE_VERSION}.${BUILDQUALIFIER}" -Dtycho.mode=maven
79+
./mvnw org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion="${RELEASE_VERSION}.${BUILDQUALIFIER}"
8080
git commit -a -m "Prepare release pmd-eclipse-plugin ${RELEASE_VERSION}.${BUILDQUALIFIER}"
81-
git tag "${RELEASE_VERSION}.${BUILDQUALIFIER}"
81+
git tag -m "Release version ${RELEASE_VERSION}.${BUILDQUALIFIER}" "${RELEASE_VERSION}.${BUILDQUALIFIER}"
8282
echo "Create (temporary) release branch"
8383
git branch "pmd-eclipse-plugin-rb-${RELEASE_VERSION}"
8484

@@ -109,7 +109,7 @@ EOF
109109

110110
echo
111111
echo "Updating version in master to next"
112-
./mvnw org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion="${DEVELOPMENT_VERSION}-SNAPSHOT" -Dtycho.mode=maven
112+
./mvnw org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion="${DEVELOPMENT_VERSION}-SNAPSHOT"
113113
git commit -a -m "Prepare next pmd-eclipse-plugin development version ${DEVELOPMENT_VERSION}-SNAPSHOT"
114114
echo "Pushing master"
115115
git push origin master

0 commit comments

Comments
 (0)