Rework continuous integration for v4

doctrine · Nov 24, 2024 · 9504693 · 9504693
1 parent 437cb2f
commit 9504693
Showing 1 changed file with 32 additions and 53 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -37,10 +37,8 @@ jobs:
         os:
           - "ubuntu-22.04"
         php-version:
-          - "8.1"
-          - "8.2"
-          - "8.3"
           - "8.4"
+          - "8.5"
         dependencies:
           - "highest"
         extension:
@@ -101,15 +99,15 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
-          - "8.2"
-          - "8.3"
+          - "8.4"
         oracle-version:
           - "18"
           - "21"
           - "23"
         include:
-          - php-version: "8.4"
+          - php-version: "8.1"
+            oracle-version: "23"
+          - php-version: "8.5"
             oracle-version: "23"
 
     services:
@@ -161,15 +159,15 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
-          - "8.2"
-          - "8.3"
+          - "8.4"
         oracle-version:
           - "18"
           - "21"
           - "23"
         include:
-          - php-version: "8.4"
+          - php-version: "8.1"
+            oracle-version: "23"
+          - php-version: "8.5"
             oracle-version: "23"
 
     services:
@@ -221,7 +219,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.4"
         postgres-version:
           - "10"
           - "16"
@@ -230,16 +228,16 @@ jobs:
           - "pgsql"
           - "pdo_pgsql"
         include:
-          - php-version: "8.2"
+          - php-version: "8.1"
             postgres-version: "17"
             extension: "pgsql"
-          - php-version: "8.3"
+          - php-version: "8.1"
             postgres-version: "17"
-            extension: "pgsql"
-          - php-version: "8.4"
+            extension: "pdo_pgsql"
+          - php-version: "8.5"
             postgres-version: "17"
             extension: "pgsql"
-          - php-version: "8.4"
+          - php-version: "8.5"
             postgres-version: "17"
             extension: "pdo_pgsql"
 
@@ -291,31 +289,28 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.4"
         mariadb-version:
           # keep in sync with https://mariadb.org/about/#maintenance-policy
-          - "10.4"  # Oldest version supported by DBAL, LTS (Jun 2024)
-          - "10.5"  # LTS (Jun 2025)
-          - "10.6"  # LTS (Jul 2026)
-          - "10.11" # LTS (Feb 2028)
-          - "11.1"  # STS (Aug 2024)
-          - "11.2"  # STS (Nov 2024)
-          - "11.3"  # STS (Feb 2025)
+          - "10.4"  # Oldest version supported by DBAL, LTS (Jun 2024) We have code specific to 10.4.3-10.5.2
+          - "10.5"  # LTS (Jun 2025) We have code specific to 10.5.2-10.6.0
+          - "10.6"  # LTS (Jul 2026) We have code specific to 10.6.0-10.10.0
+          - "10.11" # LTS (Feb 2028) We have code specific to ^10.10
           - "11.4"  # LTS (May 2029)
         extension:
           - "mysqli"
           - "pdo_mysql"
         include:
-          - php-version: "8.2"
+          - php-version: "8.1"
             mariadb-version: "11.4"
             extension: "mysqli"
-          - php-version: "8.3"
+          - php-version: "8.1"
             mariadb-version: "11.4"
             extension: "pdo_mysql"
-          - php-version: "8.4"
+          - php-version: "8.5"
             mariadb-version: "11.4"
             extension: "mysqli"
-          - php-version: "8.4"
+          - php-version: "8.5"
             mariadb-version: "11.4"
             extension: "pdo_mysql"
 
@@ -368,10 +363,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.3"
+          - "8.4"
         mysql-version:
           - "5.7"
-          - "8.0"
+          - "8.0" # We have code specific to ^8.0
           - "9.1"
         extension:
           - "mysqli"
@@ -381,29 +376,15 @@ jobs:
         include:
           - config-file-suffix: "-tls"
             php-version: "8.1"
-            mysql-version: "8.0"
-            extension: "mysqli"
-          - php-version: "8.1"
-            mysql-version: "8.0"
+            mysql-version: "9.1"
             extension: "mysqli"
           - php-version: "8.1"
-            mysql-version: "8.0"
-            extension: "pdo_mysql"
-          # Workaround for https://bugs.mysql.com/114876
-          - php-version: "8.3"
-            mysql-version: "8.4"
+            mysql-version: "9.1"
             extension: "mysqli"
-            custom-entrypoint: >-
-              --entrypoint sh mysql:8.4 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
-          - php-version: "8.3"
-            mysql-version: "8.4"
-            extension: "pdo_mysql"
-            custom-entrypoint: >-
-              --entrypoint sh mysql:8.4 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
-          - php-version: "8.4"
+          - php-version: "8.5"
             mysql-version: "9.1"
             extension: "mysqli"
-          - php-version: "8.4"
+          - php-version: "8.5"
             mysql-version: "9.1"
             extension: "pdo_mysql"
 
@@ -461,9 +442,8 @@ jobs:
       matrix:
         php-version:
           - "8.1"
-          - "8.2"
-          - "8.3"
           - "8.4"
+          - "8.5"
         extension:
           - "sqlsrv"
           - "pdo_sqlsrv"
@@ -529,9 +509,8 @@ jobs:
       matrix:
         php-version:
           - "8.1"
-          - "8.2"
-          - "8.3"
           - "8.4"
+          - "8.5"
 
     services:
       ibm_db2: