From b3406b3a5352dfe95fe53df277f95f398d2ecb45 Mon Sep 17 00:00:00 2001
From: Oliver Klee <typo3-coding@oliverklee.de>
Date: Mon, 3 Feb 2025 13:14:23 +0100
Subject: [PATCH] [TASK] Make the naming schema of CI jobs consistent

Now the GitLab CI jobs have the TYPO3 version first and the
PHP version second, just like the GitHub Actions. This hopefully
helps avoid confustion like we had in the past, and helps
 reduce cognitive load when working with the CI jobs.

Fixes #1571
---
 .gitlab/pipeline/.gitlab-ci.yml               | 24 +++++++++----------
 ...ighest.yml => func-v12-php8.1-highest.yml} |  2 +-
 ...-lowest.yml => func-v12-php8.1-lowest.yml} |  2 +-
 ...ighest.yml => func-v12-php8.2-highest.yml} |  2 +-
 ...-lowest.yml => func-v12-php8.2-lowest.yml} |  2 +-
 ...ighest.yml => func-v12-php8.3-highest.yml} |  2 +-
 ...-lowest.yml => func-v12-php8.3-lowest.yml} |  2 +-
 ...ighest.yml => unit-v12-php8.1-highest.yml} |  2 +-
 ...-lowest.yml => unit-v12-php8.1-lowest.yml} |  2 +-
 ...ighest.yml => unit-v12-php8.2-highest.yml} |  2 +-
 ...-lowest.yml => unit-v12-php8.2-lowest.yml} |  2 +-
 ...ighest.yml => unit-v12-php8.3-highest.yml} |  2 +-
 ...-lowest.yml => unit-v12-php8.3-lowest.yml} |  2 +-
 13 files changed, 24 insertions(+), 24 deletions(-)
 rename .gitlab/pipeline/jobs/{func-php8.1-v12-highest.yml => func-v12-php8.1-highest.yml} (94%)
 rename .gitlab/pipeline/jobs/{func-php8.1-v12-lowest.yml => func-v12-php8.1-lowest.yml} (94%)
 rename .gitlab/pipeline/jobs/{func-php8.2-v12-highest.yml => func-v12-php8.2-highest.yml} (94%)
 rename .gitlab/pipeline/jobs/{func-php8.2-v12-lowest.yml => func-v12-php8.2-lowest.yml} (94%)
 rename .gitlab/pipeline/jobs/{func-php8.3-v12-highest.yml => func-v12-php8.3-highest.yml} (94%)
 rename .gitlab/pipeline/jobs/{func-php8.3-v12-lowest.yml => func-v12-php8.3-lowest.yml} (94%)
 rename .gitlab/pipeline/jobs/{unit-php8.1-v12-highest.yml => unit-v12-php8.1-highest.yml} (91%)
 rename .gitlab/pipeline/jobs/{unit-php8.1-v12-lowest.yml => unit-v12-php8.1-lowest.yml} (94%)
 rename .gitlab/pipeline/jobs/{unit-php8.2-v12-highest.yml => unit-v12-php8.2-highest.yml} (91%)
 rename .gitlab/pipeline/jobs/{unit-php8.2-v12-lowest.yml => unit-v12-php8.2-lowest.yml} (94%)
 rename .gitlab/pipeline/jobs/{unit-php8.3-v12-highest.yml => unit-v12-php8.3-highest.yml} (91%)
 rename .gitlab/pipeline/jobs/{unit-php8.3-v12-lowest.yml => unit-v12-php8.3-lowest.yml} (94%)

diff --git a/.gitlab/pipeline/.gitlab-ci.yml b/.gitlab/pipeline/.gitlab-ci.yml
index ffdc9da6..ca4d4e25 100644
--- a/.gitlab/pipeline/.gitlab-ci.yml
+++ b/.gitlab/pipeline/.gitlab-ci.yml
@@ -14,12 +14,12 @@ 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-php8.1-v12-highest.yml'
-  - '/.gitlab/pipeline/jobs/func-php8.1-v12-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/func-v12-php8.1-highest.yml'
+  - '/.gitlab/pipeline/jobs/func-v12-php8.1-lowest.yml'
+  - '/.gitlab/pipeline/jobs/func-v12-php8.2-highest.yml'
+  - '/.gitlab/pipeline/jobs/func-v12-php8.2-lowest.yml'
+  - '/.gitlab/pipeline/jobs/func-v12-php8.3-highest.yml'
+  - '/.gitlab/pipeline/jobs/func-v12-php8.3-lowest.yml'
   - '/.gitlab/pipeline/jobs/javascript-lint.yml'
   - '/.gitlab/pipeline/jobs/json-lint.yml'
   - '/.gitlab/pipeline/jobs/php-cs-fixer.yml'
@@ -29,12 +29,12 @@ include:
   - '/.gitlab/pipeline/jobs/phpcs.yml'
   - '/.gitlab/pipeline/jobs/rector.yml'
   - '/.gitlab/pipeline/jobs/typoscript-lint.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-v12-highest.yml'
-  - '/.gitlab/pipeline/jobs/unit-php8.2-v12-lowest.yml'
-  - '/.gitlab/pipeline/jobs/unit-php8.3-v12-highest.yml'
-  - '/.gitlab/pipeline/jobs/unit-php8.3-v12-lowest.yml'
+  - '/.gitlab/pipeline/jobs/unit-v12-php8.1-highest.yml'
+  - '/.gitlab/pipeline/jobs/unit-v12-php8.1-lowest.yml'
+  - '/.gitlab/pipeline/jobs/unit-v12-php8.2-highest.yml'
+  - '/.gitlab/pipeline/jobs/unit-v12-php8.2-lowest.yml'
+  - '/.gitlab/pipeline/jobs/unit-v12-php8.3-highest.yml'
+  - '/.gitlab/pipeline/jobs/unit-v12-php8.3-lowest.yml'
   - '/.gitlab/pipeline/jobs/xliff-lint.yml'
   - '/.gitlab/pipeline/jobs/yaml-lint.yml'
   - template: Security/Secret-Detection.gitlab-ci.yml
diff --git a/.gitlab/pipeline/jobs/func-php8.1-v12-highest.yml b/.gitlab/pipeline/jobs/func-v12-php8.1-highest.yml
similarity index 94%
rename from .gitlab/pipeline/jobs/func-php8.1-v12-highest.yml
rename to .gitlab/pipeline/jobs/func-v12-php8.1-highest.yml
index 49ced8ca..d18a8720 100644
--- a/.gitlab/pipeline/jobs/func-php8.1-v12-highest.yml
+++ b/.gitlab/pipeline/jobs/func-v12-php8.1-highest.yml
@@ -1,4 +1,4 @@
-func-php8.1-v11-highest:
+func-v12-php8.1-highest:
   extends: .default
   image: ghcr.io/typo3/core-testing-php81:latest
   services:
diff --git a/.gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml b/.gitlab/pipeline/jobs/func-v12-php8.1-lowest.yml
similarity index 94%
rename from .gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml
rename to .gitlab/pipeline/jobs/func-v12-php8.1-lowest.yml
index 4963df1a..b7cb154c 100644
--- a/.gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml
+++ b/.gitlab/pipeline/jobs/func-v12-php8.1-lowest.yml
@@ -1,4 +1,4 @@
-func-php8.1-v11-lowest:
+func-v12-php8.1-lowest:
   extends: .default
   image: ghcr.io/typo3/core-testing-php81:latest
   services:
diff --git a/.gitlab/pipeline/jobs/func-php8.2-v12-highest.yml b/.gitlab/pipeline/jobs/func-v12-php8.2-highest.yml
similarity index 94%
rename from .gitlab/pipeline/jobs/func-php8.2-v12-highest.yml
rename to .gitlab/pipeline/jobs/func-v12-php8.2-highest.yml
index cb3d952d..26ef23f6 100644
--- a/.gitlab/pipeline/jobs/func-php8.2-v12-highest.yml
+++ b/.gitlab/pipeline/jobs/func-v12-php8.2-highest.yml
@@ -1,4 +1,4 @@
-func-php8.2-v12-highest:
+func-v12-php8.2-highest:
   extends: .default
   image: ghcr.io/typo3/core-testing-php82:latest
   services:
diff --git a/.gitlab/pipeline/jobs/func-php8.2-v12-lowest.yml b/.gitlab/pipeline/jobs/func-v12-php8.2-lowest.yml
similarity index 94%
rename from .gitlab/pipeline/jobs/func-php8.2-v12-lowest.yml
rename to .gitlab/pipeline/jobs/func-v12-php8.2-lowest.yml
index 2ba379d9..87cad2f4 100644
--- a/.gitlab/pipeline/jobs/func-php8.2-v12-lowest.yml
+++ b/.gitlab/pipeline/jobs/func-v12-php8.2-lowest.yml
@@ -1,4 +1,4 @@
-func-php8.2-v12-lowest:
+func-v12-php8.2-lowest:
   extends: .default
   image: ghcr.io/typo3/core-testing-php82:latest
   services:
diff --git a/.gitlab/pipeline/jobs/func-php8.3-v12-highest.yml b/.gitlab/pipeline/jobs/func-v12-php8.3-highest.yml
similarity index 94%
rename from .gitlab/pipeline/jobs/func-php8.3-v12-highest.yml
rename to .gitlab/pipeline/jobs/func-v12-php8.3-highest.yml
index eb2a0f0f..5defe7b2 100644
--- a/.gitlab/pipeline/jobs/func-php8.3-v12-highest.yml
+++ b/.gitlab/pipeline/jobs/func-v12-php8.3-highest.yml
@@ -1,4 +1,4 @@
-func-php8.3-v11-highest:
+func-v12-php8.3-highest:
   extends: .default
   image: ghcr.io/typo3/core-testing-php83:latest
   services:
diff --git a/.gitlab/pipeline/jobs/func-php8.3-v12-lowest.yml b/.gitlab/pipeline/jobs/func-v12-php8.3-lowest.yml
similarity index 94%
rename from .gitlab/pipeline/jobs/func-php8.3-v12-lowest.yml
rename to .gitlab/pipeline/jobs/func-v12-php8.3-lowest.yml
index 3eb28a19..bd67f5a9 100644
--- a/.gitlab/pipeline/jobs/func-php8.3-v12-lowest.yml
+++ b/.gitlab/pipeline/jobs/func-v12-php8.3-lowest.yml
@@ -1,4 +1,4 @@
-func-php8.3-v12-lowest:
+func-v12-php8.3-lowest:
   extends: .default
   image: ghcr.io/typo3/core-testing-php83:latest
   services:
diff --git a/.gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml b/.gitlab/pipeline/jobs/unit-v12-php8.1-highest.yml
similarity index 91%
rename from .gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml
rename to .gitlab/pipeline/jobs/unit-v12-php8.1-highest.yml
index fc1fb616..3ff0fc54 100644
--- a/.gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml
+++ b/.gitlab/pipeline/jobs/unit-v12-php8.1-highest.yml
@@ -1,4 +1,4 @@
-unit-php8.1-v12-highest:
+unit-v12-php8.1-highest:
   extends: .default
   image: ghcr.io/typo3/core-testing-php81:latest
   stage: test
diff --git a/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml b/.gitlab/pipeline/jobs/unit-v12-php8.1-lowest.yml
similarity index 94%
rename from .gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml
rename to .gitlab/pipeline/jobs/unit-v12-php8.1-lowest.yml
index 7e3a7005..b62fcf7c 100644
--- a/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml
+++ b/.gitlab/pipeline/jobs/unit-v12-php8.1-lowest.yml
@@ -1,4 +1,4 @@
-unit-php8.1-v12-lowest:
+unit-v12-php8.1-lowest:
   extends: .default
   image: ghcr.io/typo3/core-testing-php81:latest
   stage: test
diff --git a/.gitlab/pipeline/jobs/unit-php8.2-v12-highest.yml b/.gitlab/pipeline/jobs/unit-v12-php8.2-highest.yml
similarity index 91%
rename from .gitlab/pipeline/jobs/unit-php8.2-v12-highest.yml
rename to .gitlab/pipeline/jobs/unit-v12-php8.2-highest.yml
index 9663b4be..fd068b32 100644
--- a/.gitlab/pipeline/jobs/unit-php8.2-v12-highest.yml
+++ b/.gitlab/pipeline/jobs/unit-v12-php8.2-highest.yml
@@ -1,4 +1,4 @@
-unit-php8.2-v12-highest:
+unit-v12-php8.2-highest:
   extends: .default
   image: ghcr.io/typo3/core-testing-php82:latest
   stage: test
diff --git a/.gitlab/pipeline/jobs/unit-php8.2-v12-lowest.yml b/.gitlab/pipeline/jobs/unit-v12-php8.2-lowest.yml
similarity index 94%
rename from .gitlab/pipeline/jobs/unit-php8.2-v12-lowest.yml
rename to .gitlab/pipeline/jobs/unit-v12-php8.2-lowest.yml
index 2a86d30f..1f5aeb99 100644
--- a/.gitlab/pipeline/jobs/unit-php8.2-v12-lowest.yml
+++ b/.gitlab/pipeline/jobs/unit-v12-php8.2-lowest.yml
@@ -1,4 +1,4 @@
-unit-php8.2-v12-lowest:
+unit-v12-php8.2-lowest:
   extends: .default
   image: ghcr.io/typo3/core-testing-php82:latest
   stage: test
diff --git a/.gitlab/pipeline/jobs/unit-php8.3-v12-highest.yml b/.gitlab/pipeline/jobs/unit-v12-php8.3-highest.yml
similarity index 91%
rename from .gitlab/pipeline/jobs/unit-php8.3-v12-highest.yml
rename to .gitlab/pipeline/jobs/unit-v12-php8.3-highest.yml
index 24338fe8..1b2344b3 100644
--- a/.gitlab/pipeline/jobs/unit-php8.3-v12-highest.yml
+++ b/.gitlab/pipeline/jobs/unit-v12-php8.3-highest.yml
@@ -1,4 +1,4 @@
-unit-php8.3-v12-highest:
+unit-v12-php8.3-highest:
   extends: .default
   image: ghcr.io/typo3/core-testing-php83:latest
   stage: test
diff --git a/.gitlab/pipeline/jobs/unit-php8.3-v12-lowest.yml b/.gitlab/pipeline/jobs/unit-v12-php8.3-lowest.yml
similarity index 94%
rename from .gitlab/pipeline/jobs/unit-php8.3-v12-lowest.yml
rename to .gitlab/pipeline/jobs/unit-v12-php8.3-lowest.yml
index 094565a2..9661b4f1 100644
--- a/.gitlab/pipeline/jobs/unit-php8.3-v12-lowest.yml
+++ b/.gitlab/pipeline/jobs/unit-v12-php8.3-lowest.yml
@@ -1,4 +1,4 @@
-unit-php8.3-v12-lowest:
+unit-v12-php8.3-lowest:
   extends: .default
   image: ghcr.io/typo3/core-testing-php83:latest
   stage: test