From d01d5fd4ac35287cb59b89a6415284b9ac5a63a0 Mon Sep 17 00:00:00 2001 From: Sebastiaan Stok Date: Thu, 4 Jul 2019 13:42:06 +0200 Subject: [PATCH] Whoop die scoop Here we go! --- .hubkit/pre-release.php | 4 ++-- composer.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.hubkit/pre-release.php b/.hubkit/pre-release.php index e3a4284..4848d50 100644 --- a/.hubkit/pre-release.php +++ b/.hubkit/pre-release.php @@ -32,7 +32,7 @@ $style->warning([ 'Pull request '.$pr['html_url'].' was opened for this release.', - 'The process will automatically continue once this pull request it merged.', + 'The process will automatically continue once this pull request is merged.', '!! DO NOT ABORT THE COMMAND !!' ]); @@ -46,7 +46,7 @@ $progress->advance(); } - if ($github->getPullRequest($pr['number'])['state'] === 'closed') { + if ($github->getPullRequest($pr['number'])['merged'] === false) { $progress->finish('Pull request was closed. Aborting.'); exit(1); diff --git a/composer.json b/composer.json index 14c7f75..9f1d1fc 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "require": {}, "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "1.0-dev" } } }