From 8bd35d47adfb6871e8e3883138dab341f7fdda81 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 11 Sep 2020 10:43:57 +0200 Subject: [PATCH 1/2] [ticket/16597] Remove not supported branches from doctum-all.conf.php PHPBB3-16597 --- build/doctum-all.conf.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/build/doctum-all.conf.php b/build/doctum-all.conf.php index 5acc62ba58..a6e5663e12 100644 --- a/build/doctum-all.conf.php +++ b/build/doctum-all.conf.php @@ -14,18 +14,6 @@ require __DIR__ . '/doctum-checkout.conf.php'; $config['versions'] = Doctum\Version\GitVersionCollection::create(__DIR__ . '/../') - /* - This would be nice, but currently causes various problems that need - debugging. - ->addFromTags('release-3.0.*') - ->add('3.0.x', '3.0-next (olympus)') - ->addFromTags('release-3.1.*') - ->add('3.1.x', '3.1-next (ascraeus)') - ->add('master') - */ - ->add('3.0.x') - ->add('3.1.x') - ->add('3.2.x') ->add('3.3.x') ->add('master') ; From 0d2e9455aa0d8c7c9d7bd6ee3d72a6cca0697ea5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 11 Sep 2020 19:31:43 +0200 Subject: [PATCH 2/2] [ticket/16597] Stop building docs with sami for 3.3 and above PHPBB3-16597 --- build/sami-all.conf.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/sami-all.conf.php b/build/sami-all.conf.php index 91f12f296e..465c0af9f0 100644 --- a/build/sami-all.conf.php +++ b/build/sami-all.conf.php @@ -26,8 +26,6 @@ $config['versions'] = Sami\Version\GitVersionCollection::create(__DIR__ . '/../' ->add('3.0.x') ->add('3.1.x') ->add('3.2.x') - ->add('3.3.x') - ->add('master') ; return new Sami\Sami($iterator, $config);