From b70908ec1d9c744fd1d7c10b48018d9d9f22e582 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Tue, 4 May 2021 20:01:42 +0200
Subject: [PATCH] [TASK] gitlab-ci: PHP 8.0 unit test nightlies min/max
Needs a phpdocumentor/type-resolver raise:
composer req phpdocumentor/type-resolver:^1.4
Change-Id: Iffecb88d34a4c04816eff5543611192fcc3b8296
Resolves: #94063
Releases: master
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/69018
Tested-by: core-ci <typo3@b13.com>
Tested-by: Daniel Goerz <daniel.goerz@posteo.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Daniel Goerz <daniel.goerz@posteo.de>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
Build/gitlab-ci/nightly/unit.yml | 70 ++++++++++++++++++++++++++++++
composer.json | 2 +-
composer.lock | 19 +++-----
typo3/sysext/extbase/composer.json | 2 +-
4 files changed, 79 insertions(+), 14 deletions(-)
diff --git a/Build/gitlab-ci/nightly/unit.yml b/Build/gitlab-ci/nightly/unit.yml
index 6a64c99810bf..9ec001478e61 100644
--- a/Build/gitlab-ci/nightly/unit.yml
+++ b/Build/gitlab-ci/nightly/unit.yml
@@ -125,3 +125,73 @@ unit php 8.0 locked random:
script:
- Build/Scripts/runTests.sh -s composerInstall -p 8.0
- Build/Scripts/runTests.sh -s unitRandom -p 8.0
+
+unit php 8.0 max:
+ stage: unit
+ only:
+ - schedules
+ cache:
+ key: master-composer-max
+ paths:
+ - .cache
+ script:
+ - Build/Scripts/runTests.sh -s composerInstallMax -p 8.0
+ - Build/Scripts/runTests.sh -s unit -p 8.0
+unit php 8.0 max deprecated:
+ stage: unit
+ only:
+ - schedules
+ cache:
+ key: master-composer-max
+ paths:
+ - .cache
+ script:
+ - Build/Scripts/runTests.sh -s composerInstallMax -p 8.0
+ - Build/Scripts/runTests.sh -s unitDeprecated -p 8.0
+unit php 8.0 max random:
+ stage: unit
+ parallel: 2
+ only:
+ - schedules
+ cache:
+ key: master-composer-max
+ paths:
+ - .cache
+ script:
+ - Build/Scripts/runTests.sh -s composerInstallMax -p 8.0
+ - Build/Scripts/runTests.sh -s unitRandom -p 8.0
+
+unit php 8.0 min:
+ stage: unit
+ only:
+ - schedules
+ cache:
+ key: master-composer-min
+ paths:
+ - .cache
+ script:
+ - Build/Scripts/runTests.sh -s composerInstallMin -p 8.0
+ - Build/Scripts/runTests.sh -s unit -p 8.0
+unit php 8.0 min deprecated:
+ stage: unit
+ only:
+ - schedules
+ cache:
+ key: master-composer-min
+ paths:
+ - .cache
+ script:
+ - Build/Scripts/runTests.sh -s composerInstallMin -p 8.0
+ - Build/Scripts/runTests.sh -s unitDeprecated -p 8.0
+unit php 8.0 min random:
+ stage: unit
+ parallel: 2
+ only:
+ - schedules
+ cache:
+ key: master-composer-min
+ paths:
+ - .cache
+ script:
+ - Build/Scripts/runTests.sh -s composerInstallMin -p 8.0
+ - Build/Scripts/runTests.sh -s unitRandom -p 8.0
diff --git a/composer.json b/composer.json
index 7d97760ac71c..492128198efb 100644
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,7 @@
"guzzlehttp/guzzle": "^7.2",
"nikic/php-parser": "^4.10.4",
"phpdocumentor/reflection-docblock": "^5.2",
- "phpdocumentor/type-resolver": "^1.3",
+ "phpdocumentor/type-resolver": "^1.4",
"psr/container": "^1.1 || ^2.0",
"psr/event-dispatcher": "^1.0",
"psr/http-client": "^1.0",
diff --git a/composer.lock b/composer.lock
index 7c96300f8bf4..d0d4b58d982c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "6fa07c7c4463e4d50df3b5500fedcad3",
+ "content-hash": "e8f9eaad678902747c8a37196b0e7843",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -222,16 +222,16 @@
},
{
"name": "doctrine/annotations",
- "version": "1.11.1",
+ "version": "1.12.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
- "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad"
+ "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/ce77a7ba1770462cd705a91a151b6c3746f9c6ad",
- "reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/b17c5014ef81d212ac539f07a1001832df1b6d3b",
+ "reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b",
"shasum": ""
},
"require": {
@@ -246,11 +246,6 @@
"phpunit/phpunit": "^7.5 || ^9.1.5"
},
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.11.x-dev"
- }
- },
"autoload": {
"psr-4": {
"Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
@@ -291,9 +286,9 @@
],
"support": {
"issues": "https://github.com/doctrine/annotations/issues",
- "source": "https://github.com/doctrine/annotations/tree/1.11.1"
+ "source": "https://github.com/doctrine/annotations/tree/1.12.1"
},
- "time": "2020-10-26T10:28:16+00:00"
+ "time": "2021-02-21T21:00:45+00:00"
},
{
"name": "doctrine/cache",
diff --git a/typo3/sysext/extbase/composer.json b/typo3/sysext/extbase/composer.json
index 0bfbaf2821d1..c61bb7706e22 100644
--- a/typo3/sysext/extbase/composer.json
+++ b/typo3/sysext/extbase/composer.json
@@ -20,7 +20,7 @@
},
"require": {
"phpdocumentor/reflection-docblock": "^5.2",
- "phpdocumentor/type-resolver": "^1.3",
+ "phpdocumentor/type-resolver": "^1.4",
"symfony/dependency-injection": "^5.2",
"symfony/property-access": "^5.2",
"symfony/property-info": "^5.2",
--
GitLab