mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-07 20:08:53 +00:00
Merge pull request #6805 from rxu/ticket/17498-master
[ticket/17498] Move to Ubuntu 22.04 runner images for SQLite and MSSQL tests - master
This commit is contained in:
commit
81e9f46a55
1 changed files with 3 additions and 6 deletions
9
.github/workflows/tests.yml
vendored
9
.github/workflows/tests.yml
vendored
|
@ -370,15 +370,12 @@ jobs:
|
||||||
|
|
||||||
# Other database types, namely sqlite3 and mssql
|
# Other database types, namely sqlite3 and mssql
|
||||||
other-tests:
|
other-tests:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- php: '8.1'
|
- php: '8.1'
|
||||||
db: "sqlite3"
|
db: "sqlite3"
|
||||||
- php: '8.1'
|
|
||||||
db: "mcr.microsoft.com/mssql/server:2017-latest"
|
|
||||||
db_alias: 'MSSQL 2017'
|
|
||||||
- php: '8.1'
|
- php: '8.1'
|
||||||
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
|
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
|
||||||
db_alias: 'MSSQL 2019'
|
db_alias: 'MSSQL 2019'
|
||||||
|
@ -390,7 +387,7 @@ jobs:
|
||||||
|
|
||||||
services:
|
services:
|
||||||
mssql:
|
mssql:
|
||||||
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 }}
|
image: ${{ 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:2022-CU13-ubuntu-22.04' || matrix.db }}
|
||||||
env:
|
env:
|
||||||
SA_PASSWORD: "Pssw0rd_12"
|
SA_PASSWORD: "Pssw0rd_12"
|
||||||
ACCEPT_EULA: "y"
|
ACCEPT_EULA: "y"
|
||||||
|
@ -422,7 +419,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-CU27-ubuntu-20.04' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ]
|
if [ $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
|
||||||
|
|
Loading…
Add table
Reference in a new issue