From 9f1c0687b4987df815f277fe0be39720378cff0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Uzna=C5=84ski?= Date: Wed, 19 Oct 2022 15:12:07 +0200 Subject: [PATCH] [TASK] Add lowest and highest dependencies to gitlab ci (#655) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Łukasz Uznański --- .gitlab/pipeline/.gitlab-ci.yml | 18 ++++++++++++------ ...7.4-v11.yml => func-php7.4-v11-highest.yml} | 5 +++-- .../pipeline/jobs/func-php7.4-v11-lowest.yml | 13 +++++++++++++ ...8.0-v11.yml => func-php8.0-v11-highest.yml} | 5 +++-- .../pipeline/jobs/func-php8.0-v11-lowest.yml | 13 +++++++++++++ ...8.1-v11.yml => func-php8.1-v11-highest.yml} | 5 +++-- .../pipeline/jobs/func-php8.1-v11-lowest.yml | 13 +++++++++++++ .../pipeline/jobs/unit-php7.4-v11-highest.yml | 11 +++++++++++ .../pipeline/jobs/unit-php7.4-v11-lowest.yml | 11 +++++++++++ .gitlab/pipeline/jobs/unit-php7.4-v11.yml | 10 ---------- .../pipeline/jobs/unit-php8.0-v11-highest.yml | 11 +++++++++++ .../pipeline/jobs/unit-php8.0-v11-lowest.yml | 11 +++++++++++ .gitlab/pipeline/jobs/unit-php8.0-v11.yml | 10 ---------- .../pipeline/jobs/unit-php8.1-v11-highest.yml | 11 +++++++++++ .../pipeline/jobs/unit-php8.1-v11-lowest.yml | 11 +++++++++++ .gitlab/pipeline/jobs/unit-php8.1-v11.yml | 10 ---------- 16 files changed, 126 insertions(+), 42 deletions(-) rename .gitlab/pipeline/jobs/{func-php7.4-v11.yml => func-php7.4-v11-highest.yml} (52%) create mode 100644 .gitlab/pipeline/jobs/func-php7.4-v11-lowest.yml rename .gitlab/pipeline/jobs/{func-php8.0-v11.yml => func-php8.0-v11-highest.yml} (52%) create mode 100644 .gitlab/pipeline/jobs/func-php8.0-v11-lowest.yml rename .gitlab/pipeline/jobs/{func-php8.1-v11.yml => func-php8.1-v11-highest.yml} (52%) create mode 100644 .gitlab/pipeline/jobs/func-php8.1-v11-lowest.yml create mode 100644 .gitlab/pipeline/jobs/unit-php7.4-v11-highest.yml create mode 100644 .gitlab/pipeline/jobs/unit-php7.4-v11-lowest.yml delete mode 100644 .gitlab/pipeline/jobs/unit-php7.4-v11.yml create mode 100644 .gitlab/pipeline/jobs/unit-php8.0-v11-highest.yml create mode 100644 .gitlab/pipeline/jobs/unit-php8.0-v11-lowest.yml delete mode 100644 .gitlab/pipeline/jobs/unit-php8.0-v11.yml create mode 100644 .gitlab/pipeline/jobs/unit-php8.1-v11-highest.yml create mode 100644 .gitlab/pipeline/jobs/unit-php8.1-v11-lowest.yml delete mode 100644 .gitlab/pipeline/jobs/unit-php8.1-v11.yml diff --git a/.gitlab/pipeline/.gitlab-ci.yml b/.gitlab/pipeline/.gitlab-ci.yml index 200cb27..db73fc9 100644 --- a/.gitlab/pipeline/.gitlab-ci.yml +++ b/.gitlab/pipeline/.gitlab-ci.yml @@ -12,9 +12,12 @@ include: - '/.gitlab/pipeline/jobs/.variables.yml' - '/.gitlab/pipeline/jobs/build-composer-dependencies.yml' - '/.gitlab/pipeline/jobs/composer-normalize.yml' - - '/.gitlab/pipeline/jobs/func-php7.4-v11.yml' - - '/.gitlab/pipeline/jobs/func-php8.0-v11.yml' - - '/.gitlab/pipeline/jobs/func-php8.1-v11.yml' + - '/.gitlab/pipeline/jobs/func-php7.4-v11-highest.yml' + - '/.gitlab/pipeline/jobs/func-php7.4-v11-lowest.yml' + - '/.gitlab/pipeline/jobs/func-php8.0-v11-highest.yml' + - '/.gitlab/pipeline/jobs/func-php8.0-v11-lowest.yml' + - '/.gitlab/pipeline/jobs/func-php8.1-v11-highest.yml' + - '/.gitlab/pipeline/jobs/func-php8.1-v11-lowest.yml' - '/.gitlab/pipeline/jobs/javascript-lint.yml' - '/.gitlab/pipeline/jobs/json-lint.yml' - '/.gitlab/pipeline/jobs/php-copypaste-check.yml' @@ -23,9 +26,12 @@ include: - '/.gitlab/pipeline/jobs/php-lint-php8.1.yml' - '/.gitlab/pipeline/jobs/phpcs.yml' - '/.gitlab/pipeline/jobs/ts-lint.yml' - - '/.gitlab/pipeline/jobs/unit-php7.4-v11.yml' - - '/.gitlab/pipeline/jobs/unit-php8.0-v11.yml' - - '/.gitlab/pipeline/jobs/unit-php8.1-v11.yml' + - '/.gitlab/pipeline/jobs/unit-php7.4-v11-highest.yml' + - '/.gitlab/pipeline/jobs/unit-php7.4-v11-lowest.yml' + - '/.gitlab/pipeline/jobs/unit-php8.0-v11-highest.yml' + - '/.gitlab/pipeline/jobs/unit-php8.0-v11-lowest.yml' + - '/.gitlab/pipeline/jobs/unit-php8.1-v11-highest.yml' + - '/.gitlab/pipeline/jobs/unit-php8.1-v11-lowest.yml' - '/.gitlab/pipeline/jobs/xliff-lint.yml' - '/.gitlab/pipeline/jobs/yaml-lint.yml' - template: Security/License-Scanning.gitlab-ci.yml diff --git a/.gitlab/pipeline/jobs/func-php7.4-v11.yml b/.gitlab/pipeline/jobs/func-php7.4-v11-highest.yml similarity index 52% rename from .gitlab/pipeline/jobs/func-php7.4-v11.yml rename to .gitlab/pipeline/jobs/func-php7.4-v11-highest.yml index aa2302c..a0c90e7 100644 --- a/.gitlab/pipeline/jobs/func-php7.4-v11.yml +++ b/.gitlab/pipeline/jobs/func-php7.4-v11-highest.yml @@ -1,4 +1,4 @@ -func-php7.4-v11: +func-php7.4-v11-highest: extends: .default image: php:7.4 services: @@ -8,5 +8,6 @@ func-php7.4-v11: - build-composer-dependencies - php-lint-php7.4 script: - - composer require --no-progress typo3/cms-core:"^11.5" + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^11.5" + - composer update --no-ansi --no-interaction --no-progress --with-dependencies - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional diff --git a/.gitlab/pipeline/jobs/func-php7.4-v11-lowest.yml b/.gitlab/pipeline/jobs/func-php7.4-v11-lowest.yml new file mode 100644 index 0000000..0062fb6 --- /dev/null +++ b/.gitlab/pipeline/jobs/func-php7.4-v11-lowest.yml @@ -0,0 +1,13 @@ +func-php7.4-v11-lowest: + extends: .default + image: php:7.4 + services: + - mariadb:10 + stage: test + needs: + - build-composer-dependencies + - php-lint-php7.4 + script: + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^11.5" + - composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest + - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional diff --git a/.gitlab/pipeline/jobs/func-php8.0-v11.yml b/.gitlab/pipeline/jobs/func-php8.0-v11-highest.yml similarity index 52% rename from .gitlab/pipeline/jobs/func-php8.0-v11.yml rename to .gitlab/pipeline/jobs/func-php8.0-v11-highest.yml index 501f615..b107c90 100644 --- a/.gitlab/pipeline/jobs/func-php8.0-v11.yml +++ b/.gitlab/pipeline/jobs/func-php8.0-v11-highest.yml @@ -1,4 +1,4 @@ -func-php8.0-v11: +func-php8.0-v11-highest: extends: .default image: php:8.0 services: @@ -8,5 +8,6 @@ func-php8.0-v11: - build-composer-dependencies - php-lint-php8.0 script: - - composer require --no-progress typo3/cms-core:"^11.5" + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^11.5" + - composer update --no-ansi --no-interaction --no-progress --with-dependencies - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional diff --git a/.gitlab/pipeline/jobs/func-php8.0-v11-lowest.yml b/.gitlab/pipeline/jobs/func-php8.0-v11-lowest.yml new file mode 100644 index 0000000..1e76d6c --- /dev/null +++ b/.gitlab/pipeline/jobs/func-php8.0-v11-lowest.yml @@ -0,0 +1,13 @@ +func-php8.0-v11-lowest: + extends: .default + image: php:8.0 + services: + - mariadb:10 + stage: test + needs: + - build-composer-dependencies + - php-lint-php8.0 + script: + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^11.5" + - composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest + - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional diff --git a/.gitlab/pipeline/jobs/func-php8.1-v11.yml b/.gitlab/pipeline/jobs/func-php8.1-v11-highest.yml similarity index 52% rename from .gitlab/pipeline/jobs/func-php8.1-v11.yml rename to .gitlab/pipeline/jobs/func-php8.1-v11-highest.yml index e964eb4..a65dcbc 100644 --- a/.gitlab/pipeline/jobs/func-php8.1-v11.yml +++ b/.gitlab/pipeline/jobs/func-php8.1-v11-highest.yml @@ -1,4 +1,4 @@ -func-php8.1-v11: +func-php8.1-v11-highest: extends: .default image: php:8.1 services: @@ -8,5 +8,6 @@ func-php8.1-v11: - build-composer-dependencies - php-lint-php8.1 script: - - composer require --no-progress typo3/cms-core:"^11.5" + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^11.5" + - composer update --no-ansi --no-interaction --no-progress --with-dependencies - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional diff --git a/.gitlab/pipeline/jobs/func-php8.1-v11-lowest.yml b/.gitlab/pipeline/jobs/func-php8.1-v11-lowest.yml new file mode 100644 index 0000000..34ac50e --- /dev/null +++ b/.gitlab/pipeline/jobs/func-php8.1-v11-lowest.yml @@ -0,0 +1,13 @@ +func-php8.1-v11-lowest: + extends: .default + image: php:8.1 + services: + - mariadb:10 + stage: test + needs: + - build-composer-dependencies + - php-lint-php8.1 + script: + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^11.5" + - composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest + - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional diff --git a/.gitlab/pipeline/jobs/unit-php7.4-v11-highest.yml b/.gitlab/pipeline/jobs/unit-php7.4-v11-highest.yml new file mode 100644 index 0000000..9a8b64e --- /dev/null +++ b/.gitlab/pipeline/jobs/unit-php7.4-v11-highest.yml @@ -0,0 +1,11 @@ +unit-php7.4-v11-highest: + extends: .default + image: php:7.4 + stage: test + needs: + - build-composer-dependencies + - php-lint-php7.4 + script: + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^11.5" + - composer update --no-ansi --no-interaction --no-progress --with-dependencies + - composer ci:tests:unit diff --git a/.gitlab/pipeline/jobs/unit-php7.4-v11-lowest.yml b/.gitlab/pipeline/jobs/unit-php7.4-v11-lowest.yml new file mode 100644 index 0000000..c184c34 --- /dev/null +++ b/.gitlab/pipeline/jobs/unit-php7.4-v11-lowest.yml @@ -0,0 +1,11 @@ +unit-php7.4-v11-lowest: + extends: .default + image: php:7.4 + stage: test + needs: + - build-composer-dependencies + - php-lint-php7.4 + script: + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^11.5" + - composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest + - composer ci:tests:unit diff --git a/.gitlab/pipeline/jobs/unit-php7.4-v11.yml b/.gitlab/pipeline/jobs/unit-php7.4-v11.yml deleted file mode 100644 index fb172ba..0000000 --- a/.gitlab/pipeline/jobs/unit-php7.4-v11.yml +++ /dev/null @@ -1,10 +0,0 @@ -unit-php7.4-v11: - extends: .default - image: php:7.4 - stage: test - needs: - - build-composer-dependencies - - php-lint-php7.4 - script: - - composer require --no-progress typo3/cms-core:"^11.5" - - composer ci:tests:unit diff --git a/.gitlab/pipeline/jobs/unit-php8.0-v11-highest.yml b/.gitlab/pipeline/jobs/unit-php8.0-v11-highest.yml new file mode 100644 index 0000000..fcd167d --- /dev/null +++ b/.gitlab/pipeline/jobs/unit-php8.0-v11-highest.yml @@ -0,0 +1,11 @@ +unit-php8.0-v11-highest: + extends: .default + image: php:8.0 + stage: test + needs: + - build-composer-dependencies + - php-lint-php8.0 + script: + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^11.5" + - composer update --no-ansi --no-interaction --no-progress --with-dependencies + - composer ci:tests:unit diff --git a/.gitlab/pipeline/jobs/unit-php8.0-v11-lowest.yml b/.gitlab/pipeline/jobs/unit-php8.0-v11-lowest.yml new file mode 100644 index 0000000..4e606b1 --- /dev/null +++ b/.gitlab/pipeline/jobs/unit-php8.0-v11-lowest.yml @@ -0,0 +1,11 @@ +unit-php8.0-v11-lowest: + extends: .default + image: php:8.0 + stage: test + needs: + - build-composer-dependencies + - php-lint-php8.0 + script: + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^11.5" + - composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest + - composer ci:tests:unit diff --git a/.gitlab/pipeline/jobs/unit-php8.0-v11.yml b/.gitlab/pipeline/jobs/unit-php8.0-v11.yml deleted file mode 100644 index 5d16275..0000000 --- a/.gitlab/pipeline/jobs/unit-php8.0-v11.yml +++ /dev/null @@ -1,10 +0,0 @@ -unit-php8.0-v11: - extends: .default - image: php:8.0 - stage: test - needs: - - build-composer-dependencies - - php-lint-php8.0 - script: - - composer require --no-progress typo3/cms-core:"^11.5" - - composer ci:tests:unit diff --git a/.gitlab/pipeline/jobs/unit-php8.1-v11-highest.yml b/.gitlab/pipeline/jobs/unit-php8.1-v11-highest.yml new file mode 100644 index 0000000..4cdf5c2 --- /dev/null +++ b/.gitlab/pipeline/jobs/unit-php8.1-v11-highest.yml @@ -0,0 +1,11 @@ +unit-php8.1-v11-highest: + extends: .default + image: php:8.1 + stage: test + needs: + - build-composer-dependencies + - php-lint-php8.1 + script: + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^11.5" + - composer update --no-ansi --no-interaction --no-progress --with-dependencies + - composer ci:tests:unit diff --git a/.gitlab/pipeline/jobs/unit-php8.1-v11-lowest.yml b/.gitlab/pipeline/jobs/unit-php8.1-v11-lowest.yml new file mode 100644 index 0000000..ac8c4df --- /dev/null +++ b/.gitlab/pipeline/jobs/unit-php8.1-v11-lowest.yml @@ -0,0 +1,11 @@ +unit-php8.1-v11-lowest: + extends: .default + image: php:8.1 + stage: test + needs: + - build-composer-dependencies + - php-lint-php8.1 + script: + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^11.5" + - composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest + - composer ci:tests:unit diff --git a/.gitlab/pipeline/jobs/unit-php8.1-v11.yml b/.gitlab/pipeline/jobs/unit-php8.1-v11.yml deleted file mode 100644 index b0aab20..0000000 --- a/.gitlab/pipeline/jobs/unit-php8.1-v11.yml +++ /dev/null @@ -1,10 +0,0 @@ -unit-php8.1-v11: - extends: .default - image: php:8.1 - stage: test - needs: - - build-composer-dependencies - - php-lint-php8.1 - script: - - composer require --no-progress typo3/cms-core:"^11.5" - - composer ci:tests:unit