From 6a67dda1094f837a211d9ad965a8fffc83124cb8 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Fri, 27 Dec 2019 14:47:20 +0100 Subject: [PATCH] Update dns resolver --- composer.json | 2 +- tests/makephar.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 36f0cf2c..fb4091ec 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "amphp/websocket-client": "dev-master as 1.0.0-rc2", "amphp/http-client": "^4", "amphp/socket": "^1", - "amphp/dns": "dev-master#ecbeca2ae0e93c08e8150a92810a3961fad8ecbe as v1", + "amphp/dns": "dev-master#eb0b0a2 as v1", "amphp/file": "^1", "amphp/byte-stream": "^1", "danog/dns-over-https": "^0.2", diff --git a/tests/makephar.sh b/tests/makephar.sh index e33989a5..7f91bfe1 100755 --- a/tests/makephar.sh +++ b/tests/makephar.sh @@ -4,8 +4,9 @@ PHP_MAJOR_VERSION=$(php -r 'echo PHP_MAJOR_VERSION;') PHP_MINOR_VERSION=$(php -r 'echo PHP_MINOR_VERSION;') -IS_RELEASE=n -git rev-parse "$TRAVIS_COMMIT" 2>/dev/null | grep "$TRAVIS_COMMIT" -q && IS_RELEASE=y +[ "$(git rev-list --tags --max-count=1)" == "$TRAVIS_COMMIT" ] && IS_RELEASE=y || IS_RELEASE=n + +echo "Is release: $IS_RELEASE" # Clean up rm -rf phar7 phar5 MadelineProtoPhar @@ -21,7 +22,7 @@ echo '{ "minimum-stability":"dev", "require": { "danog/madelineproto": "dev-master", - "amphp/dns": "dev-master#ecbeca2ae0e93c08e8150a92810a3961fad8ecbe as v1" + "amphp/dns": "dev-master#eb0b0a2 as v1" }, "repositories": [ {