Skip to content

Commit b52d8a7

Browse files
committed
Fix tests
1 parent 4274f30 commit b52d8a7

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

.github/workflows/tests.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ on:
1414
- main
1515
- master
1616
- develop
17+
- dev/*
1718
pull_request: # Run tests when pull requests are made on these branches in your repo
1819
branches:
1920
- main
2021
- master
2122
- develop
23+
- dev/*
2224

2325
jobs:
2426
# START Basic Checks Job (EPV, code sniffer, images check, etc.)
@@ -357,15 +359,12 @@ jobs:
357359

358360
# START Other Tests Job (SQLite 3 and mssql)
359361
other-tests:
360-
runs-on: ubuntu-20.04
362+
runs-on: ubuntu-22.04
361363
strategy:
362364
matrix:
363365
include:
364366
- php: '8.1'
365367
db: "sqlite3"
366-
- php: '8.1'
367-
db: "mcr.microsoft.com/mssql/server:2017-latest"
368-
db_alias: 'MSSQL 2017'
369368
- php: '8.1'
370369
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
371370
db_alias: 'MSSQL 2019'
@@ -377,7 +376,7 @@ jobs:
377376

378377
services:
379378
mssql:
380-
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 }}
379+
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 }}
381380
env:
382381
SA_PASSWORD: "Pssw0rd_12"
383382
ACCEPT_EULA: "y"
@@ -417,7 +416,7 @@ jobs:
417416
env:
418417
MATRIX_DB: ${{ matrix.db }}
419418
run: |
420-
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' ]
419+
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' ]
421420
then
422421
db='mssql'
423422
else

0 commit comments

Comments
 (0)