From 826aeb71114708633976df16487edfe7f970b505 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 20 Aug 2023 10:08:28 +0200 Subject: [PATCH] [ticket/17176] More minor cleanup after recent changes to db versions PHPBB3-17176 --- .github/setup-database.sh | 2 +- .github/workflows/tests.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/setup-database.sh b/.github/setup-database.sh index d34c7898b7..49af1a70e9 100755 --- a/.github/setup-database.sh +++ b/.github/setup-database.sh @@ -22,5 +22,5 @@ fi if [ "$MYISAM" == '1' ] then - mysql -h 127.0.0.1 -u root -e 'SET GLOBAL storage_engine=MyISAM;' + mysql -h 127.0.0.1 -u root -e 'SET GLOBAL default_storage_engine=MyISAM;' fi diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ea9146dc64..d569c42861 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -383,7 +383,7 @@ jobs: services: mssql: - image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }} + image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-latest' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }} env: SA_PASSWORD: "Pssw0rd_12" ACCEPT_EULA: "y" @@ -415,7 +415,7 @@ jobs: env: MATRIX_DB: ${{ matrix.db }} run: | - if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ] + if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-latest' ] then db='mssql' else