Skip to content

Commit 641b537

Browse files
committed
fix release script
1 parent 1db57cd commit 641b537

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

bin/dev

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,8 @@ while getopts "bustefcdp" OPTION; do
2020
f)
2121
./bin/php-cs-fixer fix
2222
;;
23-
t)
24-
./bin/run-fun-test.sh "$2"
25-
;;
2623
c)
27-
docker-compose run -e CHANGELOG_GITHUB_TOKEN=${CHANGELOG_GITHUB_TOKEN:-""} --workdir="/mqdev" --rm generate-changelog github_changelog_generator --future-release "$2" --simple-list
24+
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
2825
;;
2926

3027
d) docker-compose run --workdir="/mqdev" --rm dev php pkg/enqueue-bundle/Tests/Functional/app/console.php config:dump-reference enqueue -vvv

bin/release

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ then
88
exit 1
99
fi
1010

11-
./bin/dev -c $1 && git add CHANGELOG.md && git commit -m "Release $1" -S && git push origin master
11+
CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
1212

13-
./bin/subtree-split
13+
./bin/dev -c $1 "$CURRENT_BRANCH" && git add CHANGELOG.md && git commit -m "Release $1" -S && git push origin "$CURRENT_BRANCH"
1414

15-
CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
15+
./bin/subtree-split
1616

1717
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
1818
do
@@ -28,8 +28,8 @@ do
2828

2929
(
3030
cd $TMP_DIR;
31-
git clone $REMOTE_URL . --depth=200
32-
git checkout $CURRENT_BRANCH;
31+
git clone $REMOTE_URL .
32+
git checkout "$CURRENT_BRANCH";
3333
# gsort comes with coreutils packages. brew install coreutils
3434
LAST_RELEASE=$(git tag -l [0-9].* | gsort -V | tail -n1 )
3535
if [[ -z "$LAST_RELEASE" ]]; then

0 commit comments

Comments
 (0)