CI: Add MySQL 9, reduce test matrix

doctrine · Jul 3, 2024 · aea9cae · aea9cae
1 parent b741182
commit aea9cae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 29 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -378,57 +378,34 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
-          - "8.1"
+          - "8.3"
         mysql-version:
           - "5.7"
           - "8.0"
+          - "9.0"
         extension:
           - "mysqli"
           - "pdo_mysql"
         config-file-suffix:
           - ""
         include:
-          - mysql-version: "8.0"
-            # https://stackoverflow.com/questions/60902904/how-to-pass-mysql-native-password-to-mysql-service-in-github-actions
-            custom-entrypoint: >-
-              --entrypoint sh mysql:8.0 -c "exec docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password"
           - config-file-suffix: "-tls"
             php-version: "7.4"
             mysql-version: "8.0"
             extension: "mysqli"
-          - php-version: "8.2"
+          - php-version: "7.4"
             mysql-version: "8.0"
             extension: "mysqli"
-            custom-entrypoint: >-
-              --entrypoint sh mysql:8.0 -c "exec docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password"
-          - php-version: "8.2"
+          - php-version: "7.4"
             mysql-version: "8.0"
             extension: "pdo_mysql"
-            custom-entrypoint: >-
-              --entrypoint sh mysql:8.0 -c "exec docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password"
-          - php-version: "8.3"
-            mysql-version: "8.0"
-            extension: "mysqli"
+          # Workaround for https://bugs.mysql.com/114876
           - php-version: "8.3"
-            mysql-version: "8.0"
-            extension: "pdo_mysql"
-          - php-version: "7.4"
             mysql-version: "8.4"
             extension: "mysqli"
             custom-entrypoint: >-
               --entrypoint sh mysql:8.4 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
-          - php-version: "7.4"
-            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.1"
-            mysql-version: "8.4"
-            extension: "mysqli"
-            custom-entrypoint: >-
-              --entrypoint sh mysql:8.4 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
-          - php-version: "8.1"
+          - php-version: "8.3"
             mysql-version: "8.4"
             extension: "pdo_mysql"
             custom-entrypoint: >-

diff --git a/tests/Driver/VersionAwarePlatformDriverTest.php b/tests/Driver/VersionAwarePlatformDriverTest.php
@@ -51,6 +51,8 @@ public static function mySQLVersionProvider(): array
             ['8', MySQL80Platform::class],
             ['8.0', MySQL80Platform::class],
             ['8.0.11', MySQL80Platform::class],
+            ['8.4.1', MySQL80Platform::class],
+            ['9.0.0', MySQL80Platform::class],
             ['6', MySQL57Platform::class],
             ['10.0.15-MariaDB-1~wheezy', MySQLPlatform::class],
             ['5.5.5-10.1.25-MariaDB', MySQLPlatform::class],