update release scripts.

makasim · makasim · commit d2ee0700d965 · 2018-11-27T14:36:32.000+02:00
diff --git a/bin/changelog b/bin/changelog
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -e
+
+if (( "$#" != 1 ))
+then
+    echo "Tag has to be provided"
+    exit 1
+fi
+
+docker-compose run -e CHANGELOG_GITHUB_TOKEN=${CHANGELOG_GITHUB_TOKEN:-""} --workdir="/mqdev" --rm generate-changelog github_changelog_generator --future-release "$1" --no-issues --unreleased-only --output "CHANGELOG_FUTURE.md"
+
+#git add CHANGELOG.md && git commit -m "Release $1" -S && git push origin "$CURRENT_BRANCH"
diff --git a/bin/dev b/bin/dev
@@ -3,7 +3,7 @@
 set -x
 set -e
 
-while getopts "bustefcdp" OPTION; do
+while getopts "bustefdp" OPTION; do
   case $OPTION in
     b)
       docker-compose pull && docker-compose build
@@ -20,9 +20,6 @@ while getopts "bustefcdp" OPTION; do
     f)
       ./bin/php-cs-fixer fix
       ;;
-    c)
-      docker-compose run -e CHANGELOG_GITHUB_TOKEN=${CHANGELOG_GITHUB_TOKEN:-""} --workdir="/mqdev" --rm generate-changelog github_changelog_generator --release-branch="$3" --future-release "$2" --simple-list
-      ;;
 
     d) docker-compose run --workdir="/mqdev" --rm dev php pkg/enqueue-bundle/Tests/Functional/app/console.php config:dump-reference enqueue -vvv
       ;;
diff --git a/bin/release b/bin/release
@@ -8,9 +8,17 @@ then
     exit 1
 fi
 
+
+if [ ! -f ./CHANGELOG_FUTURE.md ]; then
+    echo "Release changelog has not been generated. File CHANGELOG_FUTURE.md does not exist."
+    exit 1
+fi
+
+rm ./CHANGELOG_FUTURE.md
+
 CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
 
-./bin/dev -c $1 "$CURRENT_BRANCH" && git add CHANGELOG.md && git commit -m "Release $1" -S && git push origin "$CURRENT_BRANCH"
+git add CHANGELOG.md && git commit -m "Release $1" -S && git push origin "$CURRENT_BRANCH"
 
 ./bin/subtree-split
 
