Merge branch '1.7' into 1

silverstripe · Feb 29, 2024 · 59f612a · 59f612a
2 parents d6113aa + 7cec501
commit 59f612a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -146,7 +146,7 @@ jobs:
         ports:
           - 5432:5432
       mariadb:
-        image: mariadb
+        image: mariadb:10.11
         env:
           MARIADB_HOST: 127.0.0.1
           MARIADB_ROOT_PASSWORD: root
@@ -487,7 +487,7 @@ jobs:
               composer require "silverstripe/sqlite3:^2 || ^3" --no-update
             fi
             if [[ "${{ matrix.endtoend }}" == "true" ]] && ! [[ $GITHUB_REPOSITORY =~ /recipe-testing$ ]]; then
-              composer require "silverstripe/recipe-testing:^2 || ^3" --dev --no-update
+              composer require "silverstripe/recipe-testing:^2 || ^3 || ^4" --dev --no-update
             fi
 
             # Require silverstripe/installer for non-recipes and all but a few modules
@@ -683,15 +683,15 @@ jobs:
             if [[ "${{ matrix.db }}" =~ mysql ]]; then
               if [[ "${{ matrix.db }}" == "mysql57pdo" ]]; then
                 echo "mysql version":
-                mysql --port=3357 --user=root --password=root --execute="SELECT VERSION();" || true
+                mysql --host=127.0.0.1 --port=3357 --user=root --password=root --execute="SELECT VERSION();" || true
                 cat << EOF > .env
           SS_DATABASE_CLASS="MySQLPDODatabase"
           SS_DATABASE_PORT="3357"
           EOF
               else
                 MYSQL_PORT=${{ matrix.db == 'mysql57' && '3357' || '3380' }}
                 echo "mysql version":
-                mysql --user=root --password=root --port=$MYSQL_PORT --execute="SELECT VERSION();" || true
+                mysql --host=127.0.0.1 --user=root --password=root --port=$MYSQL_PORT --execute="SELECT VERSION();" || true
                 cat << EOF > .env
           SS_DATABASE_CLASS="MySQLDatabase"
           SS_DATABASE_PORT="${MYSQL_PORT}"
@@ -719,7 +719,7 @@ jobs:
           EOF
             elif [[ "${{ matrix.db }}" =~ mariadb ]]; then
               echo "mariadb version":
-              mysql --port=3311 --user=root --password=root --execute="SELECT VERSION();" || true
+              mysql --host=127.0.0.1 --port=3311 --user=root --password=root --execute="SELECT VERSION();" || true
               cat << EOF > .env
           SS_DATABASE_SERVER="127.0.0.1"
           SS_DATABASE_PORT="3311"