Skip to content

Commit 361cfb5

Browse files
authored
Merge pull request #27 from Derky/feature/mssql-actions
Run SQLite 3 and mssql steps on ubuntu-20.04
2 parents 221151a + 5084fd1 commit 361cfb5

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

.github/workflows/tests.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -305,24 +305,21 @@ jobs:
305305

306306
# START Other Tests Job (SQLite 3 and mssql)
307307
other-tests:
308-
runs-on: ubuntu-20.04 # TODO: Change back to 'ubuntu-22.04' when https://github.com/microsoft/mssql-docker/issues/899 resolved
308+
runs-on: ubuntu-22.04
309309
strategy:
310310
matrix:
311311
include:
312312
- php: '8.1'
313313
db: "sqlite3"
314314
- php: '8.1'
315-
db: "mcr.microsoft.com/mssql/server:2017-latest"
316-
db_alias: 'MSSQL 2017'
317-
- php: '8.1'
318-
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
319-
db_alias: 'MSSQL 2019'
315+
db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04"
316+
db_alias: 'MSSQL 2022'
320317

321318
name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
322319

323320
services:
324321
mssql:
325-
image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
322+
image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' || matrix.db }}
326323
env:
327324
SA_PASSWORD: "Pssw0rd_12"
328325
ACCEPT_EULA: "y"
@@ -362,7 +359,7 @@ jobs:
362359
env:
363360
MATRIX_DB: ${{ matrix.db }}
364361
run: |
365-
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ]
362+
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ]
366363
then
367364
db='mssql'
368365
else

0 commit comments

Comments
 (0)