From b24726c267f405330cd608c381bf093d3e89c714 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 6 Aug 2019 12:37:14 +0200 Subject: [PATCH] using 19.1 branch now --- doc/rpm-build/checkout-build-archives.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/rpm-build/checkout-build-archives.php b/doc/rpm-build/checkout-build-archives.php index 6b66b51d3e..fe3fc62987 100755 --- a/doc/rpm-build/checkout-build-archives.php +++ b/doc/rpm-build/checkout-build-archives.php @@ -20,7 +20,7 @@ $config = array( 'packagename' => 'egroupware', 'version' => '19.1', // '19.1' 'packaging' => date('Ymd'), // '20160520' - 'branch' => 'master', // checked out branch + 'branch' => '19.1', // checked out branch 'tag' => '$version.$packaging', // name of tag 'checkoutdir' => '~/epl-19.1-checkout', //realpath(__DIR__.'/../..'), 'egw_buildroot' => '/tmp/build_root/epl_19.1_buildroot', @@ -415,7 +415,7 @@ function do_release() $tag = config_translate('tag'); run_cmd($config['git'].' push -f origin '.$tag); // checkout release-branch again (we are on the tag!) - run_cmd($config['git'].' checkout '.'master');// we have no 19.1 branch yet $config['version']); + run_cmd($config['git'].' checkout '.$config['branch']); if (!empty($config['github_user']) || empty($config['github_token'])) {