Skip to content

Commit cdcc1ac

Browse files
authored
Merge pull request #31 from iMattPro/fixes
Repo fixes
2 parents 5f9a539 + c78ee72 commit cdcc1ac

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ jobs:
358358

359359
# START Other Tests Job (SQLite 3 and mssql)
360360
other-tests:
361-
runs-on: ubuntu-22.04
361+
runs-on: ubuntu-20.04
362362
strategy:
363363
matrix:
364364
include:
@@ -368,14 +368,14 @@ jobs:
368368
db: "mcr.microsoft.com/mssql/server:2017-latest"
369369
db_alias: 'MSSQL 2017'
370370
- php: '7.2'
371-
db: "mcr.microsoft.com/mssql/server:2019-latest"
371+
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
372372
db_alias: 'MSSQL 2019'
373373

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

376376
services:
377377
mssql:
378-
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 }}
379379
env:
380380
SA_PASSWORD: "Pssw0rd_12"
381381
ACCEPT_EULA: "y"
@@ -415,7 +415,7 @@ jobs:
415415
env:
416416
MATRIX_DB: ${{ matrix.db }}
417417
run: |
418-
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' ]
419419
then
420420
db='mssql'
421421
else

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This is the repository for the development of the Topic Prefixes phpBB extension.
44

5-
[![Build Status](https://github.com/phpbb-extensions/topicprefixes/workflows/Tests/badge.svg)](https://github.com/phpbb-extensions/topicprefixes/actions)
5+
[![Build Status](https://github.com/phpbb-extensions/topicprefixes/actions/workflows/tests.yml/badge.svg)](https://github.com/phpbb-extensions/topicprefixes/actions)
66
[![codecov](https://codecov.io/gh/phpbb-extensions/topicprefixes/branch/master/graph/badge.svg?token=Dc0GWOeQWj)](https://codecov.io/gh/phpbb-extensions/topicprefixes)
77
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/phpbb-extensions/topicprefixes/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/phpbb-extensions/topicprefixes/?branch=master)
88

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"composer/installers": "~1.0"
2323
},
2424
"require-dev": {
25-
"phing/phing": "2.4.*"
25+
"phing/phing": "~2.4"
2626
},
2727
"extra": {
2828
"display-name": "phpBB Topic Prefixes",

0 commit comments

Comments
 (0)