From d6e1989e1f7dba95b36244099cf07ca2767f9e4a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 5 Dec 2020 14:50:46 +0100
Subject: [PATCH] [ticket/16659] First test run with all current tests

PHPBB3-16659
---
 .github/workflows/tests.yml | 70 +++++++++++++++++++------------------
 travis/setup-database.sh    |  5 +--
 2 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 93d5fd4026..2c50ded105 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,42 +17,43 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - php: 7.1
+                    - php: '7.1'
                       db: "none"
                       NOTESTS: 1
-                    - php: 7.1
+                    - php: '7.1'
                       db: "mariadb:10.1"
-#                    - php: 7.1
-#                      db: "mariadb:10.2"
-#                    - php: 7.1
-#                      db: "mariadb:10.3"
-#                    - php: 7.1
-#                      db: "mariadb:10.4"
-#                    - php: 7.1
-#                      db: "mariadb:10.5"
-#                    - php: 7.1
-#                      db: "postgres:9.5"
-#                    - php: 7.1
-#                      db: "postgres:10"
-#                    - php: 7.1
-#                      db: "postgres:11"
-#                    - php: 7.1
-#                      db: "postgres:12"
-#                    - php: 7.1
-#                      db: "postgres:13"
-#                    - php: 7.1
-#                      db: "sqlite3"
-#                    - php: 7.1
-#                      db: "mysql:5.6"
-#                    - php: 7.1
-#                      db: "mysql:5.7"
-#                    - php: 7.2
-#                      db: "mysql:5.7"
-#                    - php: 7.3
-#                      db: "mysql:5.7"
-#                    - php: 7.4
-#                      db: "mysql:5.7"
-                    - php: 7.4
+                    - php: '7.1'
+                      db: "mariadb:10.2"
+                    - php: '7.1'
+                      db: "mariadb:10.3"
+                    - php: '7.1'
+                      db: "mariadb:10.4"
+                    - php: '7.1'
+                      db: "mariadb:10.5"
+                    - php: '7.1'
+                      db: "postgres:9.5"
+                    - php: '7.1'
+                      db: "postgres:10"
+                    - php: '7.1'
+                      db: "postgres:11"
+                    - php: '7.1'
+                      db: "postgres:12"
+                    - php: '7.1'
+                      db: "postgres:13"
+                    - php: '7.1'
+                      db: "sqlite3"
+                    - php: '7.1'
+                      db: "mysql:5.6"
+                      MYISAM: 1
+                    - php: '7.1'
+                      db: "mysql:5.7"
+                    - php: '7.2'
+                      db: "mysql:5.7"
+                    - php: '7.3'
+                      db: "mysql:5.7"
+                    - php: '7.4'
+                      db: "mysql:5.7"
+                    - php: '7.4'
                       db: "mysql:8.0"
                     - php: '8.0'
                       db: "mysql:5.7"
@@ -132,8 +133,9 @@ jobs:
                   DB: ${{steps.database-type.outputs.db}}
                   PHP_VERSION: ${{ matrix.php }}
                   NOTESTS: ${{ matrix.NOTESTS != 1 && '0' || '1' }}
+                  MYISAM: ${{ matrix.MYISAM != 1 && '0' || '1' }}
               run: |
-                  travis/setup-database.sh $DB $PHP_VERSION $NOTESTS
+                  travis/setup-database.sh $DB $PHP_VERSION $NOTESTS $MYISAM
 
             - name: Phing sniff
               env:
diff --git a/travis/setup-database.sh b/travis/setup-database.sh
index 0a4085158d..479e17f592 100755
--- a/travis/setup-database.sh
+++ b/travis/setup-database.sh
@@ -14,6 +14,7 @@ set -x
 DB=$1
 TRAVIS_PHP_VERSION=$2
 NOTESTS=$3
+MYISAM=$4
 
 if [ "$NOTESTS" == '1' ]
 then
@@ -26,7 +27,7 @@ then
 	psql -c 'create database phpbb_tests;' -U postgres
 fi
 
-if [ "$TRAVIS_PHP_VERSION" == "5.6" -a "$DB" == "mysql" ]
+if [ "$MYISAM" == '1' ]
 then
-	mysql -e 'SET GLOBAL storage_engine=MyISAM;'
+	mysql -h 127.0.0.1 -u root -e 'SET GLOBAL storage_engine=MyISAM;'
 fi