diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f7a8bd54..6eeafc0a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## [0.9.1](https://github.com/php-enqueue/enqueue-dev/tree/0.9.1) (2018-11-27) +[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.9.0...0.9.1) + +**Merged pull requests:** + +- Allow installing stable dependencies. [\#660](https://github.com/php-enqueue/enqueue-dev/pull/660) ([makasim](https://github.com/makasim)) + ## [0.9.0](https://github.com/php-enqueue/enqueue-dev/tree/0.9) (2018-11-27) [Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.8.42...0.9) @@ -978,4 +985,4 @@ ## [0.1.0](https://github.com/php-enqueue/enqueue-dev/tree/0.1.0) (2016-12-29) -\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file +\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* diff --git a/bin/changelog b/bin/changelog new file mode 100755 index 000000000..8a9296175 --- /dev/null +++ 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" \ No newline at end of file diff --git a/bin/dev b/bin/dev index 462332e6f..e5f40ffbd 100755 --- 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 index 5bee5e195..4ef1a760a 100755 --- a/bin/release +++ b/bin/release @@ -8,13 +8,21 @@ 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 -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 +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 wamp monitoring do echo "" echo "" diff --git a/pkg/amqp-bunny/composer.json b/pkg/amqp-bunny/composer.json index 7bda3946e..086db9534 100644 --- a/pkg/amqp-bunny/composer.json +++ b/pkg/amqp-bunny/composer.json @@ -10,7 +10,7 @@ "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.7", "bunny/bunny": "^0.2.4|^0.3|^0.4", - "enqueue/amqp-tools": "0.9.x-dev" + "enqueue/amqp-tools": "^0.9" }, "require-dev": { "phpunit/phpunit": "~5.4.0", diff --git a/pkg/amqp-ext/composer.json b/pkg/amqp-ext/composer.json index 5bedd525c..6dcdd96e2 100644 --- a/pkg/amqp-ext/composer.json +++ b/pkg/amqp-ext/composer.json @@ -10,7 +10,7 @@ "ext-amqp": "^1.9.3", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.7", - "enqueue/amqp-tools": "0.9.x-dev" + "enqueue/amqp-tools": "^0.9" }, "require-dev": { "phpunit/phpunit": "~5.4.0", diff --git a/pkg/amqp-lib/composer.json b/pkg/amqp-lib/composer.json index eb4848248..415ca9f23 100644 --- a/pkg/amqp-lib/composer.json +++ b/pkg/amqp-lib/composer.json @@ -9,7 +9,7 @@ "php": "^7.1.3", "php-amqplib/php-amqplib": "^2.8", "queue-interop/amqp-interop": "^0.8", - "enqueue/amqp-tools": "0.9.x-dev" + "enqueue/amqp-tools": "^0.9" }, "require-dev": { "phpunit/phpunit": "~5.4.0", diff --git a/pkg/async-command/composer.json b/pkg/async-command/composer.json index 8e44fe39b..5d93f47b1 100644 --- a/pkg/async-command/composer.json +++ b/pkg/async-command/composer.json @@ -7,7 +7,7 @@ "license": "MIT", "require": { "php": ">=7.1", - "enqueue/enqueue": "0.9.x-dev", + "enqueue/enqueue": "^0.9", "queue-interop/queue-interop": "^0.7", "symfony/console": "^3.4|^4", "symfony/process": "^3.4|^4" diff --git a/pkg/async-event-dispatcher/composer.json b/pkg/async-event-dispatcher/composer.json index 2c9d253e8..ca63adfb0 100644 --- a/pkg/async-event-dispatcher/composer.json +++ b/pkg/async-event-dispatcher/composer.json @@ -7,7 +7,7 @@ "license": "MIT", "require": { "php": "^7.1.3", - "enqueue/enqueue": "0.9.x-dev", + "enqueue/enqueue": "^0.9", "queue-interop/queue-interop": "^0.7", "symfony/event-dispatcher": "^3.4|^4" }, diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json index 4ca94b6ef..c74197602 100644 --- a/pkg/enqueue-bundle/composer.json +++ b/pkg/enqueue-bundle/composer.json @@ -10,8 +10,8 @@ "symfony/framework-bundle": "^3.4|^4", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.7", - "enqueue/enqueue": "0.9.x-dev", - "enqueue/null": "0.9.x-dev" + "enqueue/enqueue": "^0.9", + "enqueue/null": "^0.9" }, "support": { "email": "opensource@forma-pro.com", diff --git a/pkg/enqueue/composer.json b/pkg/enqueue/composer.json index 31b2159fd..26d147705 100644 --- a/pkg/enqueue/composer.json +++ b/pkg/enqueue/composer.json @@ -9,8 +9,8 @@ "php": "^7.1.3", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.7", - "enqueue/null": "0.9.x-dev", - "enqueue/dsn": "0.9.x-dev", + "enqueue/null": "^0.9", + "enqueue/dsn": "^0.9", "ramsey/uuid": "^2|^3.5", "psr/log": "^1", "psr/container": "^1" diff --git a/pkg/fs/composer.json b/pkg/fs/composer.json index cb7cd4732..0be58949c 100644 --- a/pkg/fs/composer.json +++ b/pkg/fs/composer.json @@ -8,7 +8,7 @@ "require": { "php": "^7.1.3", "queue-interop/queue-interop": "^0.7", - "enqueue/dsn": "0.9.x-dev", + "enqueue/dsn": "^0.9", "symfony/filesystem": "^3.4|^4", "makasim/temp-file": "^0.2@stable" }, diff --git a/pkg/gps/composer.json b/pkg/gps/composer.json index bb37b07e3..295ae105f 100644 --- a/pkg/gps/composer.json +++ b/pkg/gps/composer.json @@ -9,7 +9,7 @@ "php": "^7.1.3", "queue-interop/queue-interop": "^0.7", "google/cloud-pubsub": "^1.0", - "enqueue/dsn": "0.9.x-dev" + "enqueue/dsn": "^0.9" }, "require-dev": { "phpunit/phpunit": "~5.4.0", diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json index 54efca4a4..3ade4f79a 100644 --- a/pkg/job-queue/composer.json +++ b/pkg/job-queue/composer.json @@ -7,7 +7,7 @@ "license": "MIT", "require": { "php": "^7.1.3", - "enqueue/enqueue": "0.9.x-dev", + "enqueue/enqueue": "^0.9", "enqueue/null": "0.9.x-dev", "queue-interop/queue-interop": "^0.7", "doctrine/orm": "~2.4" diff --git a/pkg/monitoring/composer.json b/pkg/monitoring/composer.json index 11a4b70db..e31ecbc11 100644 --- a/pkg/monitoring/composer.json +++ b/pkg/monitoring/composer.json @@ -7,7 +7,7 @@ "license": "MIT", "require": { "php": "^7.1.3", - "enqueue/enqueue": "0.9.x-dev", + "enqueue/enqueue": "^0.9", "ramsey/uuid": "^3", "enqueue/dsn": "0.9.x-dev" }, diff --git a/pkg/redis/composer.json b/pkg/redis/composer.json index 41931ffa8..0b0a3a37b 100644 --- a/pkg/redis/composer.json +++ b/pkg/redis/composer.json @@ -8,7 +8,7 @@ "require": { "php": "^7.1.3", "queue-interop/queue-interop": "^0.7", - "enqueue/dsn": "0.9.x-dev", + "enqueue/dsn": "^0.9", "ramsey/uuid": "^3" }, "require-dev": { diff --git a/pkg/simple-client/composer.json b/pkg/simple-client/composer.json index e204c0586..a4bbc478b 100644 --- a/pkg/simple-client/composer.json +++ b/pkg/simple-client/composer.json @@ -7,7 +7,7 @@ "license": "MIT", "require": { "php": "^7.1.3", - "enqueue/enqueue": "0.9.x-dev", + "enqueue/enqueue": "^0.9", "queue-interop/amqp-interop": "^0.8", "queue-interop/queue-interop": "^0.7", "symfony/config": "^3.4|^4" diff --git a/pkg/sqs/composer.json b/pkg/sqs/composer.json index c6c4d07fe..ec8388c4f 100644 --- a/pkg/sqs/composer.json +++ b/pkg/sqs/composer.json @@ -8,7 +8,7 @@ "require": { "php": "^7.1.3", "queue-interop/queue-interop": "^0.7", - "enqueue/dsn": "0.9.x-dev", + "enqueue/dsn": "^0.9", "aws/aws-sdk-php": "~3.26" }, "require-dev": { diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json index ba79e4c2f..4efde62d7 100644 --- a/pkg/stomp/composer.json +++ b/pkg/stomp/composer.json @@ -7,7 +7,7 @@ "license": "MIT", "require": { "php": "^7.1.3", - "enqueue/dsn": "0.9.x-dev", + "enqueue/dsn": "^0.9", "stomp-php/stomp-php": "^4", "queue-interop/queue-interop": "^0.7", "php-http/guzzle6-adapter": "^1.1", diff --git a/pkg/wamp/composer.json b/pkg/wamp/composer.json index 62a48c735..7c2f15e64 100644 --- a/pkg/wamp/composer.json +++ b/pkg/wamp/composer.json @@ -8,7 +8,7 @@ "require": { "php": "^7.1.3", "queue-interop/queue-interop": "^0.7", - "enqueue/dsn": "0.9.x-dev", + "enqueue/dsn": "^0.9", "thruway/pawl-transport": "^0.5.0", "voryx/thruway": "^0.5.3" },