Merge pull request #125 from wojsmol/rest/add-mariadb

swissspidy · web-flow · commit f8c404b0c03a · 2025-03-27T13:39:43.000+01:00
Add MariaDB to a testing matrix
diff --git a/.github/workflows/reusable-testing.yml b/.github/workflows/reusable-testing.yml
@@ -36,22 +36,22 @@ jobs:
             {
               "php": "5.6",
               "wp": "3.7",
-              "mysql": "5.6"
+              "mysql": "mysql-5.6"
             },
             {
               "php": "5.6",
               "wp": "6.2",
-              "mysql": "8.0"
+              "mysql": "mysql-8.0"
             },
             {
               "php": "7.2",
               "wp": "4.9",
-              "mysql": "5.6"
+              "mysql": "mysql-5.6"
             },
             {
               "php": "7.2",
               "wp": "latest",
-              "mysql": "8.0"
+              "mysql": "mysql-8.0"
             },
             {
               "php": "7.2",
@@ -61,7 +61,7 @@ jobs:
             {
               "php": "7.3",
               "wp": "latest",
-              "mysql": "8.0"
+              "mysql": "mysql-8.0"
             },
             {
               "php": "7.3",
@@ -71,7 +71,7 @@ jobs:
             {
               "php": "7.4",
               "wp": "latest",
-              "mysql": "8.0"
+              "mysql": "mysql-8.0"
             },
             {
               "php": "7.4",
@@ -81,7 +81,7 @@ jobs:
             {
               "php": "8.0",
               "wp": "latest",
-              "mysql": "8.0"
+              "mysql": "mysql-8.0"
             },
             {
               "php": "8.0",
@@ -91,7 +91,7 @@ jobs:
             {
               "php": "8.1",
               "wp": "latest",
-              "mysql": "8.0"
+              "mysql": "mysql-8.0"
             },
             {
               "php": "8.1",
@@ -101,7 +101,7 @@ jobs:
             {
               "php": "8.2",
               "wp": "latest",
-              "mysql": "8.0"
+              "mysql": "mysql-8.0"
             },
             {
               "php": "8.2",
@@ -111,7 +111,7 @@ jobs:
             {
               "php": "8.3",
               "wp": "latest",
-              "mysql": "8.0",
+              "mysql": "mysql-8.0",
               "coverage": true
             },
             {
@@ -122,52 +122,52 @@ jobs:
             {
               "php": "7.2",
               "wp": "trunk",
-              "mysql": "8.0"
+              "mysql": "mysql-8.0"
             },
             {
               "php": "7.2",
               "wp": "trunk",
-              "mysql": "5.7"
+              "mysql": "mysql-5.7"
             },
             {
               "php": "7.2",
               "wp": "trunk",
-              "mysql": "5.6"
+              "mysql": "mysql-5.6"
             },
             {
               "php": "7.4",
               "wp": "trunk",
-              "mysql": "8.0"
+              "mysql": "mysql-8.0"
             },
             {
               "php": "8.0",
               "wp": "trunk",
-              "mysql": "8.0"
+              "mysql": "mysql-8.0"
             },
             {
               "php": "8.0",
               "wp": "trunk",
-              "mysql": "5.7"
+              "mysql": "mysql-5.7"
             },
             {
               "php": "8.0",
               "wp": "trunk",
-              "mysql": "5.6"
+              "mysql": "mysql-5.6"
             },
             {
               "php": "8.1",
               "wp": "trunk",
-              "mysql": "8.0"
+              "mysql": "mysql-8.0"
             },
             {
               "php": "8.2",
               "wp": "trunk",
-              "mysql": "8.0"
+              "mysql": "mysql-8.0"
             },
             {
               "php": "8.3",
               "wp": "trunk",
-              "mysql": "8.0"
+              "mysql": "mysql-8.0"
             },
             {
               "php": "8.3",
@@ -177,7 +177,7 @@ jobs:
             {
               "php": "8.4",
               "wp": "trunk",
-              "mysql": "8.0"
+              "mysql": "mysql-8.0"
             },
             {
               "php": "8.4",
@@ -187,12 +187,22 @@ jobs:
             {
               "php": "nightly",
               "wp": "trunk",
-              "mysql": "8.0"
+              "mysql": "mysql-8.0"
             },
             {
               "php": "nightly",
               "wp": "trunk",
               "dbtype": "sqlite"
+            },
+            {
+              "php": "8,3",
+              "wp": "latest",
+              "mysql": "mariadb-11.4"
+            },
+            {
+              "php": "8,3",
+              "wp": "trunk",
+              "mysql": "mariadb-11.4"
             }
           ]
         }
@@ -322,7 +332,7 @@ jobs:
   functional: #-----------------------------------------------------------------
     needs: prepare-functional
     if: ${{ needs.prepare-functional.outputs.matrix != '' }}
-    name: Functional - WP ${{ matrix.wp }} on PHP ${{ matrix.php }} with ${{ matrix.dbtype != 'sqlite' && format('MySQL {0}', matrix.mysql) || 'SQLite' }}${{ matrix.coverage && ' (with coverage)' || '' }}
+    name: Functional - WP ${{ matrix.wp }} on PHP ${{ matrix.php }} with ${{ matrix.dbtype != 'sqlite' && matrix.mysql || 'SQLite' }}${{ matrix.coverage && ' (with coverage)' || '' }}
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.prepare-functional.outputs.matrix) }}

Original file line number	Diff line number	Diff line change
`@@ -36,22 +36,22 @@ jobs:`
`36`	`36`	`{`
`37`	`37`	`"php": "5.6",`
`38`	`38`	`"wp": "3.7",`
`39`		`- "mysql": "5.6"`
	`39`	`+ "mysql": "mysql-5.6"`
`40`	`40`	`},`
`41`	`41`	`{`
`42`	`42`	`"php": "5.6",`
`43`	`43`	`"wp": "6.2",`
`44`		`- "mysql": "8.0"`
	`44`	`+ "mysql": "mysql-8.0"`
`45`	`45`	`},`
`46`	`46`	`{`
`47`	`47`	`"php": "7.2",`
`48`	`48`	`"wp": "4.9",`
`49`		`- "mysql": "5.6"`
	`49`	`+ "mysql": "mysql-5.6"`
`50`	`50`	`},`
`51`	`51`	`{`
`52`	`52`	`"php": "7.2",`
`53`	`53`	`"wp": "latest",`
`54`		`- "mysql": "8.0"`
	`54`	`+ "mysql": "mysql-8.0"`
`55`	`55`	`},`
`56`	`56`	`{`
`57`	`57`	`"php": "7.2",`
`@@ -61,7 +61,7 @@ jobs:`
`61`	`61`	`{`
`62`	`62`	`"php": "7.3",`
`63`	`63`	`"wp": "latest",`
`64`		`- "mysql": "8.0"`
	`64`	`+ "mysql": "mysql-8.0"`
`65`	`65`	`},`
`66`	`66`	`{`
`67`	`67`	`"php": "7.3",`
`@@ -71,7 +71,7 @@ jobs:`
`71`	`71`	`{`
`72`	`72`	`"php": "7.4",`
`73`	`73`	`"wp": "latest",`
`74`		`- "mysql": "8.0"`
	`74`	`+ "mysql": "mysql-8.0"`
`75`	`75`	`},`
`76`	`76`	`{`
`77`	`77`	`"php": "7.4",`
`@@ -81,7 +81,7 @@ jobs:`
`81`	`81`	`{`
`82`	`82`	`"php": "8.0",`
`83`	`83`	`"wp": "latest",`
`84`		`- "mysql": "8.0"`
	`84`	`+ "mysql": "mysql-8.0"`
`85`	`85`	`},`
`86`	`86`	`{`
`87`	`87`	`"php": "8.0",`
`@@ -91,7 +91,7 @@ jobs:`
`91`	`91`	`{`
`92`	`92`	`"php": "8.1",`
`93`	`93`	`"wp": "latest",`
`94`		`- "mysql": "8.0"`
	`94`	`+ "mysql": "mysql-8.0"`
`95`	`95`	`},`
`96`	`96`	`{`
`97`	`97`	`"php": "8.1",`
`@@ -101,7 +101,7 @@ jobs:`
`101`	`101`	`{`
`102`	`102`	`"php": "8.2",`
`103`	`103`	`"wp": "latest",`
`104`		`- "mysql": "8.0"`
	`104`	`+ "mysql": "mysql-8.0"`
`105`	`105`	`},`
`106`	`106`	`{`
`107`	`107`	`"php": "8.2",`
`@@ -111,7 +111,7 @@ jobs:`
`111`	`111`	`{`
`112`	`112`	`"php": "8.3",`
`113`	`113`	`"wp": "latest",`
`114`		`- "mysql": "8.0",`
	`114`	`+ "mysql": "mysql-8.0",`
`115`	`115`	`"coverage": true`
`116`	`116`	`},`
`117`	`117`	`{`
`@@ -122,52 +122,52 @@ jobs:`
`122`	`122`	`{`
`123`	`123`	`"php": "7.2",`
`124`	`124`	`"wp": "trunk",`
`125`		`- "mysql": "8.0"`
	`125`	`+ "mysql": "mysql-8.0"`
`126`	`126`	`},`
`127`	`127`	`{`
`128`	`128`	`"php": "7.2",`
`129`	`129`	`"wp": "trunk",`
`130`		`- "mysql": "5.7"`
	`130`	`+ "mysql": "mysql-5.7"`
`131`	`131`	`},`
`132`	`132`	`{`
`133`	`133`	`"php": "7.2",`
`134`	`134`	`"wp": "trunk",`
`135`		`- "mysql": "5.6"`
	`135`	`+ "mysql": "mysql-5.6"`
`136`	`136`	`},`
`137`	`137`	`{`
`138`	`138`	`"php": "7.4",`
`139`	`139`	`"wp": "trunk",`
`140`		`- "mysql": "8.0"`
	`140`	`+ "mysql": "mysql-8.0"`
`141`	`141`	`},`
`142`	`142`	`{`
`143`	`143`	`"php": "8.0",`
`144`	`144`	`"wp": "trunk",`
`145`		`- "mysql": "8.0"`
	`145`	`+ "mysql": "mysql-8.0"`
`146`	`146`	`},`
`147`	`147`	`{`
`148`	`148`	`"php": "8.0",`
`149`	`149`	`"wp": "trunk",`
`150`		`- "mysql": "5.7"`
	`150`	`+ "mysql": "mysql-5.7"`
`151`	`151`	`},`
`152`	`152`	`{`
`153`	`153`	`"php": "8.0",`
`154`	`154`	`"wp": "trunk",`
`155`		`- "mysql": "5.6"`
	`155`	`+ "mysql": "mysql-5.6"`
`156`	`156`	`},`
`157`	`157`	`{`
`158`	`158`	`"php": "8.1",`
`159`	`159`	`"wp": "trunk",`
`160`		`- "mysql": "8.0"`
	`160`	`+ "mysql": "mysql-8.0"`
`161`	`161`	`},`
`162`	`162`	`{`
`163`	`163`	`"php": "8.2",`
`164`	`164`	`"wp": "trunk",`
`165`		`- "mysql": "8.0"`
	`165`	`+ "mysql": "mysql-8.0"`
`166`	`166`	`},`
`167`	`167`	`{`
`168`	`168`	`"php": "8.3",`
`169`	`169`	`"wp": "trunk",`
`170`		`- "mysql": "8.0"`
	`170`	`+ "mysql": "mysql-8.0"`
`171`	`171`	`},`
`172`	`172`	`{`
`173`	`173`	`"php": "8.3",`
`@@ -177,7 +177,7 @@ jobs:`
`177`	`177`	`{`
`178`	`178`	`"php": "8.4",`
`179`	`179`	`"wp": "trunk",`
`180`		`- "mysql": "8.0"`
	`180`	`+ "mysql": "mysql-8.0"`
`181`	`181`	`},`
`182`	`182`	`{`
`183`	`183`	`"php": "8.4",`
`@@ -187,12 +187,22 @@ jobs:`
`187`	`187`	`{`
`188`	`188`	`"php": "nightly",`
`189`	`189`	`"wp": "trunk",`
`190`		`- "mysql": "8.0"`
	`190`	`+ "mysql": "mysql-8.0"`
`191`	`191`	`},`
`192`	`192`	`{`
`193`	`193`	`"php": "nightly",`
`194`	`194`	`"wp": "trunk",`
`195`	`195`	`"dbtype": "sqlite"`
	`196`	`+ },`
	`197`	`+ {`
	`198`	`+ "php": "8,3",`
	`199`	`+ "wp": "latest",`
	`200`	`+ "mysql": "mariadb-11.4"`
	`201`	`+ },`
	`202`	`+ {`
	`203`	`+ "php": "8,3",`
	`204`	`+ "wp": "trunk",`
	`205`	`+ "mysql": "mariadb-11.4"`
`196`	`206`	`}`
`197`	`207`	`]`
`198`	`208`	`}`
`@@ -322,7 +332,7 @@ jobs:`
`322`	`332`	`functional: #-----------------------------------------------------------------`
`323`	`333`	`needs: prepare-functional`
`324`	`334`	`if: ${{ needs.prepare-functional.outputs.matrix != '' }}`
`325`		`- name: Functional - WP ${{ matrix.wp }} on PHP ${{ matrix.php }} with ${{ matrix.dbtype != 'sqlite' && format('MySQL {0}', matrix.mysql) \|\| 'SQLite' }}${{ matrix.coverage && ' (with coverage)' \|\| '' }}`
	`335`	`+ name: Functional - WP ${{ matrix.wp }} on PHP ${{ matrix.php }} with ${{ matrix.dbtype != 'sqlite' && matrix.mysql \|\| 'SQLite' }}${{ matrix.coverage && ' (with coverage)' \|\| '' }}`
`326`	`336`	`strategy:`
`327`	`337`	`fail-fast: false`
`328`	`338`	`matrix: ${{ fromJson(needs.prepare-functional.outputs.matrix) }}`