1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-17 14:18:24 +01:00

Merge branch 'ticket/17377' into ticket/17377-master

This commit is contained in:
Marc Alexander 2024-08-06 21:10:21 +02:00
commit fdf9cb0ca8
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

@ -380,7 +380,7 @@ jobs:
db: "mcr.microsoft.com/mssql/server:2017-latest" db: "mcr.microsoft.com/mssql/server:2017-latest"
db_alias: 'MSSQL 2017' db_alias: 'MSSQL 2017'
- php: '8.1' - php: '8.1'
db: "mcr.microsoft.com/mssql/server:2019-latest" db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
db_alias: 'MSSQL 2019' db_alias: 'MSSQL 2019'
- php: '8.1' - php: '8.1'
db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04" db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04"
@ -390,7 +390,7 @@ jobs:
services: services:
mssql: mssql:
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-CU13-ubuntu-22.04' && '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-CU27-ubuntu-20.04' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
env: env:
SA_PASSWORD: "Pssw0rd_12" SA_PASSWORD: "Pssw0rd_12"
ACCEPT_EULA: "y" ACCEPT_EULA: "y"
@ -422,7 +422,7 @@ jobs:
env: env:
MATRIX_DB: ${{ matrix.db }} MATRIX_DB: ${{ matrix.db }}
run: | run: |
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-CU13-ubuntu-22.04' ] if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ]
then then
db='mssql' db='mssql'
else else