diff --git a/bin/dev b/bin/dev index 6858769ee..462332e6f 100755 --- a/bin/dev +++ b/bin/dev @@ -20,11 +20,8 @@ while getopts "bustefcdp" OPTION; do f) ./bin/php-cs-fixer fix ;; - t) - ./bin/run-fun-test.sh "$2" - ;; c) - docker-compose run -e CHANGELOG_GITHUB_TOKEN=${CHANGELOG_GITHUB_TOKEN:-""} --workdir="/mqdev" --rm generate-changelog github_changelog_generator --future-release "$2" --simple-list + 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 index 44e37f9fb..5bee5e195 100755 --- a/bin/release +++ b/bin/release @@ -8,11 +8,11 @@ then exit 1 fi -./bin/dev -c $1 && git add CHANGELOG.md && git commit -m "Release $1" -S && git push origin master +CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD` -./bin/subtree-split +./bin/dev -c $1 "$CURRENT_BRANCH" && git add CHANGELOG.md && git commit -m "Release $1" -S && git push origin "$CURRENT_BRANCH" -CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD` +./bin/subtree-split for REMOTE in origin stomp amqp-ext amqp-lib amqp-bunny amqp-tools pheanstalk gearman sqs gps fs redis dbal null rdkafka enqueue simple-client enqueue-bundle job-queue test async-event-dispatcher mongodb do @@ -28,8 +28,8 @@ do ( cd $TMP_DIR; - git clone $REMOTE_URL . --depth=200 - git checkout $CURRENT_BRANCH; + git clone $REMOTE_URL . + git checkout "$CURRENT_BRANCH"; # gsort comes with coreutils packages. brew install coreutils LAST_RELEASE=$(git tag -l [0-9].* | gsort -V | tail -n1 ) if [[ -z "$LAST_RELEASE" ]]; then