From 5f9fa253394930a038be7b05de0c640d4cfa868c Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Mon, 26 Dec 2022 07:06:50 +0100 Subject: [PATCH] [TASK] Set the minimal 12LTS version to 12.1 (#702) TYPO3 12.1 has been released. So the 12.0 sprint release is no longer relevant. --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/predefined.yml | 8 ++++---- .gitlab/pipeline/jobs/func-php8.1-v12-highest.yml | 2 +- .gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml | 2 +- .gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml | 2 +- .gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml | 2 +- CHANGELOG.md | 1 + composer.json | 10 +++++----- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a8cd9f..ce2b0b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -162,10 +162,10 @@ jobs: - typo3-version: "^11.5" php-version: "8.1" composer-dependencies: highest - - typo3-version: "^12.0" + - typo3-version: "^12.1" php-version: "8.1" composer-dependencies: lowest - - typo3-version: "^12.0" + - typo3-version: "^12.1" php-version: "8.1" composer-dependencies: highest functional-tests: @@ -244,9 +244,9 @@ jobs: - typo3-version: "^11.5" php-version: "8.1" composer-dependencies: highest - - typo3-version: "^12.0" + - typo3-version: "^12.1" php-version: "8.1" composer-dependencies: lowest - - typo3-version: "^12.0" + - typo3-version: "^12.1" php-version: "8.1" composer-dependencies: highest diff --git a/.github/workflows/predefined.yml b/.github/workflows/predefined.yml index 6e2c26b..390d178 100644 --- a/.github/workflows/predefined.yml +++ b/.github/workflows/predefined.yml @@ -211,10 +211,10 @@ jobs: - typo3-version: "^11.5" php-version: "8.1" composer-dependencies: highest - - typo3-version: "^12.0" + - typo3-version: "^12.1" php-version: "8.1" composer-dependencies: lowest - - typo3-version: "^12.0" + - typo3-version: "^12.1" php-version: "8.1" composer-dependencies: highest functional-tests: @@ -291,9 +291,9 @@ jobs: - typo3-version: "^11.5" php-version: "8.1" composer-dependencies: highest - - typo3-version: "^12.0" + - typo3-version: "^12.1" php-version: "8.1" composer-dependencies: lowest - - typo3-version: "^12.0" + - typo3-version: "^12.1" php-version: "8.1" composer-dependencies: highest diff --git a/.gitlab/pipeline/jobs/func-php8.1-v12-highest.yml b/.gitlab/pipeline/jobs/func-php8.1-v12-highest.yml index 086d685..04e14c8 100644 --- a/.gitlab/pipeline/jobs/func-php8.1-v12-highest.yml +++ b/.gitlab/pipeline/jobs/func-php8.1-v12-highest.yml @@ -8,6 +8,6 @@ func-php8.1-v11-highest: - build-composer-dependencies - php-lint-php8.1 script: - - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.0" + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.1" - 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-v12-lowest.yml b/.gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml index 95ad090..7dbb984 100644 --- a/.gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml +++ b/.gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml @@ -8,6 +8,6 @@ func-php8.1-v11-lowest: - build-composer-dependencies - php-lint-php8.1 script: - - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.0" + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.1" - 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-php8.1-v12-highest.yml b/.gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml index 92bdd46..bfd9f6a 100644 --- a/.gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml +++ b/.gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml @@ -6,5 +6,5 @@ unit-php8.1-v12-highest: - build-composer-dependencies - php-lint-php8.1 script: - - composer require --no-progress typo3/cms-core:"^12.0" + - composer require --no-progress typo3/cms-core:"^12.1" - composer ci:tests:unit diff --git a/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml b/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml index 5ee7017..8a9d266 100644 --- a/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml +++ b/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml @@ -6,6 +6,6 @@ unit-php8.1-v12-lowest: - build-composer-dependencies - php-lint-php8.1 script: - - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.0" + - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.1" - composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest - composer ci:tests:unit diff --git a/CHANGELOG.md b/CHANGELOG.md index 7245fd1..50add56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](https://semver.org/). ### Added ### Changed +- Set the minimal 12LTS version to 12.1 (#702) ### Deprecated diff --git a/composer.json b/composer.json index 8811009..e30e2b4 100644 --- a/composer.json +++ b/composer.json @@ -29,10 +29,10 @@ "require": { "php": "~7.4.0 || ~8.0.0 || ~8.1.0", "psr/http-message": "^1.0.1", - "typo3/cms-core": "^11.5.4 || ^12.0", - "typo3/cms-extbase": "^11.5.4 || ^12.0", - "typo3/cms-fluid": "^11.5.4 || ^12.0", - "typo3/cms-frontend": "^11.5.4 || ^12.0" + "typo3/cms-core": "^11.5.4 || ^12.1", + "typo3/cms-extbase": "^11.5.4 || ^12.1", + "typo3/cms-fluid": "^11.5.4 || ^12.1", + "typo3/cms-frontend": "^11.5.4 || ^12.1" }, "require-dev": { "doctrine/dbal": "^2.13.8 || ^3.3.7", @@ -50,7 +50,7 @@ "seld/jsonlint": "^1.9.0", "squizlabs/php_codesniffer": "^3.7.1", "symfony/yaml": "^5.4 || ^6.1", - "typo3/cms-fluid-styled-content": "^11.5.4 || ^12.0", + "typo3/cms-fluid-styled-content": "^11.5.4 || ^12.1", "typo3/coding-standards": "^0.6.1", "typo3/testing-framework": "^7.0@dev" },