From 26e37a55bc3c9d31e9f7e989b3f4e027c1e6a270 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Thu, 22 Feb 2024 16:04:01 +1300 Subject: [PATCH 1/3] FIX Lock mariadb to a specific version we know is supported (#107) --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0a28ef..d5e1d89 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -146,7 +146,7 @@ jobs: ports: - 5432:5432 mariadb: - image: mariadb + image: mariadb:11.2 env: MARIADB_HOST: 127.0.0.1 MARIADB_ROOT_PASSWORD: root @@ -683,7 +683,7 @@ 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" @@ -691,7 +691,7 @@ jobs: 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" From 80def072192abdfd134899baa9294378fc5d47b3 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Mon, 26 Feb 2024 12:29:14 +1300 Subject: [PATCH 2/3] FIX Allow recipe-testing ^4 (#109) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5e1d89..dbb3d8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 From 22c93abb235eb8216b78a65d2f7a8844c5ca3749 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Thu, 29 Feb 2024 10:55:46 +1300 Subject: [PATCH 3/3] ENH Use LTS for mariadb --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbb3d8f..9f333cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -146,7 +146,7 @@ jobs: ports: - 5432:5432 mariadb: - image: mariadb:11.2 + image: mariadb:10.11 env: MARIADB_HOST: 127.0.0.1 MARIADB_ROOT_PASSWORD: root