From 0d91d168f72f4222f055dcec9d630825c0a1c968 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 22 Feb 2019 10:15:14 +0100 Subject: [PATCH] use --ignore-platform-reqs --no-dev for composer install --- doc/rpm-build/checkout-build-archives.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/rpm-build/checkout-build-archives.php b/doc/rpm-build/checkout-build-archives.php index 073abf8fa7..bdb9a09771 100755 --- a/doc/rpm-build/checkout-build-archives.php +++ b/doc/rpm-build/checkout-build-archives.php @@ -327,7 +327,7 @@ function do_checkout() } chdir($config['checkoutdir']); - run_cmd('./install-php --ignore-platform-reqs --no-dev'); + run_cmd('./install.php --ignore-platform-reqs --no-dev'); } /** @@ -414,7 +414,8 @@ function do_release() run_cmd($config['git'].' push'); $tag = config_translate('tag'); run_cmd($config['git'].' push origin '.$tag); - chdir($config['checkoutdir']); + // checkout release-branch again (we are on the tag!) + run_cmd($config['git'].' checkout '.$config['version']); if (empty($config['github_user']) || empty($config['github_token'])) {