Skip to content

Commit bccf76f

Browse files
authored
Merge pull request #362 from iMattPro/fixes
Small fixes
2 parents b4053c5 + 89cf025 commit bccf76f

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/tests.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ jobs:
127127
db: "mysql:5.7"
128128
- php: '8.3'
129129
db: "mysql:5.7"
130+
- php: '8.4'
131+
db: "mysql:5.7"
130132

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

@@ -270,6 +272,8 @@ jobs:
270272
db: "postgres:14"
271273
- php: '8.3'
272274
db: "postgres:14"
275+
- php: '8.4'
276+
db: "postgres:14"
273277

274278
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
275279

@@ -364,14 +368,14 @@ jobs:
364368
db: "mcr.microsoft.com/mssql/server:2017-latest"
365369
db_alias: 'MSSQL 2017'
366370
- php: '7.2'
367-
db: "mcr.microsoft.com/mssql/server:2019-latest"
371+
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
368372
db_alias: 'MSSQL 2019'
369373

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

372376
services:
373377
mssql:
374-
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 }}
378+
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 }}
375379
env:
376380
SA_PASSWORD: "Pssw0rd_12"
377381
ACCEPT_EULA: "y"
@@ -411,7 +415,7 @@ jobs:
411415
env:
412416
MATRIX_DB: ${{ matrix.db }}
413417
run: |
414-
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ]
418+
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ]
415419
then
416420
db='mssql'
417421
else

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"composer/installers": "~1.0"
3434
},
3535
"require-dev": {
36-
"phing/phing": "2.4.*"
36+
"phing/phing": "~2.4"
3737
},
3838
"extra": {
3939
"display-name": "Board Rules",

0 commit comments

Comments
 (0)