SimplyEmail 1.4.5 Release

SimplySecurity · Dec 21, 2017 · 20b26d9 · 20b26d9
1 parent 411e950
commit 20b26d9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/.build.sh b/.build.sh
@@ -9,4 +9,4 @@ IMAGE=simplyemail
 # version
 VERSION="$(cat VERSION)"
 
-docker build --build-arg simplyemailversion="$VERSION" -t $USERNAME/$IMAGE:latest .
+docker build -t $USERNAME/$IMAGE:latest .
diff --git a/.release.sh b/.release.sh
@@ -15,16 +15,19 @@ VERSION=`cat VERSION`
 echo "version: $VERSION"
 
 # TAF, PULL, MERGE DEV
-git checkout "dev"
+git checkout -b "Version-$VERSION"
 git add --all
 git commit -m "SimplyEmail $VERSION Release"
 git tag -a "$VERSION" -m "SimplyEmail $VERSION Release"
-git push origin "dev"
-git push origin "dev" --tags
+git push origin "Version-$VERSION"
+git push origin "Version-$VERSION" --tags
 git checkout master
-git merge "dev"
+git merge "Version-$VERSION"
 git push
-hub release create $VERSION -m "SimplyEmail $VERSION Release"
+hub release create Version-$VERSION -m "SimplyEmail $VERSION Release"
+# DEL BRANCH
+git branch -d "dev"
+git branch -D "dev"
 
 # ALERT VERSION
 echo "Building Version: $VERSION"

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.4.4
+1.4.5