From 6879afe612f8b90d7f109f6175d88f8170a73f9b Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Mon, 3 Feb 2025 12:56:11 +0100 Subject: [PATCH] [TASK] Drop obsolete GitLab CI jobs Also link two existing jobs. Followup to #1566 and #1567 --- .gitlab/pipeline/.gitlab-ci.yml | 22 ++----------------- .../pipeline/jobs/func-php8.2-v11-highest.yml | 14 ------------ .../pipeline/jobs/func-php8.2-v11-lowest.yml | 14 ------------ .../pipeline/jobs/func-php8.3-v11-highest.yml | 14 ------------ .../pipeline/jobs/func-php8.3-v11-lowest.yml | 14 ------------ .../pipeline/jobs/unit-php8.2-v11-highest.yml | 12 ---------- .../pipeline/jobs/unit-php8.2-v11-lowest.yml | 12 ---------- .../pipeline/jobs/unit-php8.3-v11-highest.yml | 12 ---------- .../pipeline/jobs/unit-php8.3-v11-lowest.yml | 12 ---------- 9 files changed, 2 insertions(+), 124 deletions(-) delete mode 100644 .gitlab/pipeline/jobs/func-php8.2-v11-highest.yml delete mode 100644 .gitlab/pipeline/jobs/func-php8.2-v11-lowest.yml delete mode 100644 .gitlab/pipeline/jobs/func-php8.3-v11-highest.yml delete mode 100644 .gitlab/pipeline/jobs/func-php8.3-v11-lowest.yml delete mode 100644 .gitlab/pipeline/jobs/unit-php8.2-v11-highest.yml delete mode 100644 .gitlab/pipeline/jobs/unit-php8.2-v11-lowest.yml delete mode 100644 .gitlab/pipeline/jobs/unit-php8.3-v11-highest.yml delete mode 100644 .gitlab/pipeline/jobs/unit-php8.3-v11-lowest.yml diff --git a/.gitlab/pipeline/.gitlab-ci.yml b/.gitlab/pipeline/.gitlab-ci.yml index ee51fac8..ffdc9da6 100644 --- a/.gitlab/pipeline/.gitlab-ci.yml +++ b/.gitlab/pipeline/.gitlab-ci.yml @@ -14,43 +14,25 @@ include: - '/.gitlab/pipeline/jobs/build-composer-dependencies.yml' - '/.gitlab/pipeline/jobs/composer-normalize.yml' - '/.gitlab/pipeline/jobs/composer-psr-verify.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/func-php8.1-v12-highest.yml' - '/.gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml' - - '/.gitlab/pipeline/jobs/func-php8.2-v11-highest.yml' - - '/.gitlab/pipeline/jobs/func-php8.2-v11-lowest.yml' - '/.gitlab/pipeline/jobs/func-php8.2-v12-highest.yml' - '/.gitlab/pipeline/jobs/func-php8.2-v12-lowest.yml' + - '/.gitlab/pipeline/jobs/func-php8.3-v12-highest.yml' + - '/.gitlab/pipeline/jobs/func-php8.3-v12-lowest.yml' - '/.gitlab/pipeline/jobs/javascript-lint.yml' - '/.gitlab/pipeline/jobs/json-lint.yml' - '/.gitlab/pipeline/jobs/php-cs-fixer.yml' - - '/.gitlab/pipeline/jobs/php-lint-php7.4.yml' - - '/.gitlab/pipeline/jobs/php-lint-php8.0.yml' - '/.gitlab/pipeline/jobs/php-lint-php8.1.yml' - '/.gitlab/pipeline/jobs/php-lint-php8.2.yml' - '/.gitlab/pipeline/jobs/php-lint-php8.3.yml' - '/.gitlab/pipeline/jobs/phpcs.yml' - '/.gitlab/pipeline/jobs/rector.yml' - '/.gitlab/pipeline/jobs/typoscript-lint.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/unit-php8.1-v12-highest.yml' - '/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml' - - '/.gitlab/pipeline/jobs/unit-php8.2-v11-highest.yml' - - '/.gitlab/pipeline/jobs/unit-php8.2-v11-lowest.yml' - '/.gitlab/pipeline/jobs/unit-php8.2-v12-highest.yml' - '/.gitlab/pipeline/jobs/unit-php8.2-v12-lowest.yml' - - '/.gitlab/pipeline/jobs/unit-php8.3-v11-highest.yml' - - '/.gitlab/pipeline/jobs/unit-php8.3-v11-lowest.yml' - '/.gitlab/pipeline/jobs/unit-php8.3-v12-highest.yml' - '/.gitlab/pipeline/jobs/unit-php8.3-v12-lowest.yml' - '/.gitlab/pipeline/jobs/xliff-lint.yml' diff --git a/.gitlab/pipeline/jobs/func-php8.2-v11-highest.yml b/.gitlab/pipeline/jobs/func-php8.2-v11-highest.yml deleted file mode 100644 index c29c224a..00000000 --- a/.gitlab/pipeline/jobs/func-php8.2-v11-highest.yml +++ /dev/null @@ -1,14 +0,0 @@ -func-php8.2-v11-highest: - extends: .default - image: ghcr.io/typo3/core-testing-php82:latest - services: - - mariadb:10 - stage: test - needs: - - build-composer-dependencies - - php-lint-php8.2 - script: - - echo "Job ${CI_JOB_NAME}" - - 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:functional diff --git a/.gitlab/pipeline/jobs/func-php8.2-v11-lowest.yml b/.gitlab/pipeline/jobs/func-php8.2-v11-lowest.yml deleted file mode 100644 index 07ae3538..00000000 --- a/.gitlab/pipeline/jobs/func-php8.2-v11-lowest.yml +++ /dev/null @@ -1,14 +0,0 @@ -func-php8.2-v11-lowest: - extends: .default - image: ghcr.io/typo3/core-testing-php82:latest - services: - - mariadb:10 - stage: test - needs: - - build-composer-dependencies - - php-lint-php8.2 - script: - - echo "Job ${CI_JOB_NAME}" - - 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:functional diff --git a/.gitlab/pipeline/jobs/func-php8.3-v11-highest.yml b/.gitlab/pipeline/jobs/func-php8.3-v11-highest.yml deleted file mode 100644 index 6feac9d6..00000000 --- a/.gitlab/pipeline/jobs/func-php8.3-v11-highest.yml +++ /dev/null @@ -1,14 +0,0 @@ -func-php8.3-v11-highest: - extends: .default - image: ghcr.io/typo3/core-testing-php83:latest - services: - - mariadb:10 - stage: test - needs: - - build-composer-dependencies - - php-lint-php8.3 - script: - - echo "Job ${CI_JOB_NAME}" - - 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:functional diff --git a/.gitlab/pipeline/jobs/func-php8.3-v11-lowest.yml b/.gitlab/pipeline/jobs/func-php8.3-v11-lowest.yml deleted file mode 100644 index 2ddc49ce..00000000 --- a/.gitlab/pipeline/jobs/func-php8.3-v11-lowest.yml +++ /dev/null @@ -1,14 +0,0 @@ -func-php8.3-v11-lowest: - extends: .default - image: ghcr.io/typo3/core-testing-php83:latest - services: - - mariadb:10 - stage: test - needs: - - build-composer-dependencies - - php-lint-php8.3 - script: - - echo "Job ${CI_JOB_NAME}" - - 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:functional diff --git a/.gitlab/pipeline/jobs/unit-php8.2-v11-highest.yml b/.gitlab/pipeline/jobs/unit-php8.2-v11-highest.yml deleted file mode 100644 index 044a4305..00000000 --- a/.gitlab/pipeline/jobs/unit-php8.2-v11-highest.yml +++ /dev/null @@ -1,12 +0,0 @@ -unit-php8.2-v11-highest: - extends: .default - image: ghcr.io/typo3/core-testing-php82:latest - stage: test - needs: - - build-composer-dependencies - - php-lint-php8.2 - script: - - echo "Job ${CI_JOB_NAME}" - - 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.2-v11-lowest.yml b/.gitlab/pipeline/jobs/unit-php8.2-v11-lowest.yml deleted file mode 100644 index f1d111c4..00000000 --- a/.gitlab/pipeline/jobs/unit-php8.2-v11-lowest.yml +++ /dev/null @@ -1,12 +0,0 @@ -unit-php8.2-v11-lowest: - extends: .default - image: ghcr.io/typo3/core-testing-php82:latest - stage: test - needs: - - build-composer-dependencies - - php-lint-php8.2 - script: - - echo "Job ${CI_JOB_NAME}" - - 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.3-v11-highest.yml b/.gitlab/pipeline/jobs/unit-php8.3-v11-highest.yml deleted file mode 100644 index fa3e57e5..00000000 --- a/.gitlab/pipeline/jobs/unit-php8.3-v11-highest.yml +++ /dev/null @@ -1,12 +0,0 @@ -unit-php8.3-v11-highest: - extends: .default - image: ghcr.io/typo3/core-testing-php83:latest - stage: test - needs: - - build-composer-dependencies - - php-lint-php8.3 - script: - - echo "Job ${CI_JOB_NAME}" - - 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.3-v11-lowest.yml b/.gitlab/pipeline/jobs/unit-php8.3-v11-lowest.yml deleted file mode 100644 index 4f94d7c1..00000000 --- a/.gitlab/pipeline/jobs/unit-php8.3-v11-lowest.yml +++ /dev/null @@ -1,12 +0,0 @@ -unit-php8.3-v11-lowest: - extends: .default - image: ghcr.io/typo3/core-testing-php83:latest - stage: test - needs: - - build-composer-dependencies - - php-lint-php8.3 - script: - - echo "Job ${CI_JOB_NAME}" - - 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