From 4dfc50c13c888766e2e14260bf43ca8359e4ab46 Mon Sep 17 00:00:00 2001 From: Drew Short Date: Thu, 24 Apr 2014 10:01:11 -0400 Subject: [PATCH] Fixed some additional small issues with the version updating build scripts --- README.md | 2 +- build/linux/createMajorRelease.sh | 9 ++++----- build/linux/createMinorRelease.sh | 10 +++++----- build/linux/createPatchRelease.sh | 9 ++++----- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 6ad4487..fbc0b6e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -ImageTools v0.1.0-DEV +ImageTools v0.1.1-DEV ========== http://imagetools.sothr.com ---------- diff --git a/build/linux/createMajorRelease.sh b/build/linux/createMajorRelease.sh index ed2a484..78be7c6 100755 --- a/build/linux/createMajorRelease.sh +++ b/build/linux/createMajorRelease.sh @@ -19,6 +19,10 @@ VERSION="$major.0.0-${arr2[1]}" #update the POM mvn versions:set -DnewVersion=$VERSION +cd $HOME +. createBuildRelease.sh + +cd ../.. #commit the new patch version git commit -a -m "Creating major version $VERSION" @@ -27,8 +31,3 @@ git tag -a v$VERSION -m "Major Release Version $VERSION" #push the build and tag git push --follow-tags - -cd $HOME -. build.sh -cd $HOME -. package.sh diff --git a/build/linux/createMinorRelease.sh b/build/linux/createMinorRelease.sh index bdd3a4b..8057cc9 100755 --- a/build/linux/createMinorRelease.sh +++ b/build/linux/createMinorRelease.sh @@ -19,6 +19,11 @@ VERSION="${arr[0]}.$minor.0-${arr2[1]}" #update the POM mvn versions:set -DnewVersion=$VERSION +#Build the new version and make the necessary changes +cd $HOME +. createBuildRelease.sh + +cd ../.. #commit the new patch version git commit -a -m "Creating minor version $VERSION" @@ -27,8 +32,3 @@ git tag -a v$VERSION -m "Minor Release Version $VERSION" #push the build and tag git push --follow-tags - -cd $HOME -. build.sh -cd $HOME -. package.sh diff --git a/build/linux/createPatchRelease.sh b/build/linux/createPatchRelease.sh index 196d5fe..0c56b7c 100755 --- a/build/linux/createPatchRelease.sh +++ b/build/linux/createPatchRelease.sh @@ -19,6 +19,10 @@ VERSION="${arr[0]}.${arr[1]}.$patch-${arr2[1]}" #update the POM mvn versions:set -DnewVersion=$VERSION +cd $HOME +. createBuildRelease.sh + +cd ../.. #commit the new patch version git commit -a -m "Creating patch version $VERSION" @@ -27,8 +31,3 @@ git tag -a v$VERSION -m "Patch Release Version $VERSION" #push the build and tag git push --follow-tags - -cd $HOME -. build.sh -cd $HOME -. package.sh