Skip to content

Commit 94c0ec9

Browse files
committed
Merge branch 'master' into dev/4.0
2 parents a0155f9 + 481fd35 commit 94c0ec9

File tree

3 files changed

+22
-15
lines changed

3 files changed

+22
-15
lines changed

.github/workflows/tests.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
jobs:
2222
# START Basic Checks Job (EPV, code sniffer, images check, etc.)
2323
basic-checks:
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-22.04
2525
strategy:
2626
matrix:
2727
include:
@@ -33,14 +33,14 @@ jobs:
3333

3434
steps:
3535
- name: Checkout phpBB
36-
uses: actions/checkout@v3
36+
uses: actions/checkout@v4
3737
with:
3838
repository: phpbb/phpbb
3939
ref: ${{ env.PHPBB_BRANCH }}
4040
path: phpBB3
4141

4242
- name: Checkout extension
43-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4444
with:
4545
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
4646

@@ -89,7 +89,7 @@ jobs:
8989

9090
# START MySQL and MariaDB Job
9191
mysql-tests:
92-
runs-on: ubuntu-20.04
92+
runs-on: ubuntu-22.04
9393
strategy:
9494
matrix:
9595
include:
@@ -125,6 +125,8 @@ jobs:
125125
db: "mysql:5.7"
126126
- php: '8.3'
127127
db: "mysql:5.7"
128+
- php: '8.4'
129+
db: "mysql:5.7"
128130

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

@@ -154,14 +156,14 @@ jobs:
154156

155157
steps:
156158
- name: Checkout phpBB
157-
uses: actions/checkout@v3
159+
uses: actions/checkout@v4
158160
with:
159161
repository: phpbb/phpbb
160162
ref: ${{ env.PHPBB_BRANCH }}
161163
path: phpBB3
162164

163165
- name: Checkout extension
164-
uses: actions/checkout@v3
166+
uses: actions/checkout@v4
165167
with:
166168
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
167169

@@ -207,7 +209,7 @@ jobs:
207209

208210
# START PostgreSQL Job
209211
postgres-tests:
210-
runs-on: ubuntu-20.04
212+
runs-on: ubuntu-22.04
211213
strategy:
212214
matrix:
213215
include:
@@ -237,6 +239,8 @@ jobs:
237239
db: "postgres:14"
238240
- php: '8.3'
239241
db: "postgres:14"
242+
- php: '8.4'
243+
db: "postgres:14"
240244

241245
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
242246

@@ -268,14 +272,14 @@ jobs:
268272

269273
steps:
270274
- name: Checkout phpBB
271-
uses: actions/checkout@v3
275+
uses: actions/checkout@v4
272276
with:
273277
repository: phpbb/phpbb
274278
ref: ${{ env.PHPBB_BRANCH }}
275279
path: phpBB3
276280

277281
- name: Checkout extension
278-
uses: actions/checkout@v3
282+
uses: actions/checkout@v4
279283
with:
280284
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
281285

@@ -331,14 +335,14 @@ jobs:
331335
db: "mcr.microsoft.com/mssql/server:2017-latest"
332336
db_alias: 'MSSQL 2017'
333337
- php: '7.2'
334-
db: "mcr.microsoft.com/mssql/server:2019-latest"
338+
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
335339
db_alias: 'MSSQL 2019'
336340

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

339343
services:
340344
mssql:
341-
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 }}
345+
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 }}
342346
env:
343347
SA_PASSWORD: "Pssw0rd_12"
344348
ACCEPT_EULA: "y"
@@ -363,22 +367,22 @@ jobs:
363367

364368
steps:
365369
- name: Checkout phpBB
366-
uses: actions/checkout@v3
370+
uses: actions/checkout@v4
367371
with:
368372
repository: phpbb/phpbb
369373
ref: ${{ env.PHPBB_BRANCH }}
370374
path: phpBB3
371375

372376
- name: Checkout extension
373-
uses: actions/checkout@v3
377+
uses: actions/checkout@v4
374378
with:
375379
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
376380

377381
- id: database-type
378382
env:
379383
MATRIX_DB: ${{ matrix.db }}
380384
run: |
381-
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ]
385+
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ]
382386
then
383387
db='mssql'
384388
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 Canned Messages phpBB extension.
44

5-
[![Build Status](https://github.com/phpbb-extensions/cannedmessages/workflows/Tests/badge.svg)](https://github.com/phpbb-extensions/cannedmessages/actions)
5+
[![Build Status](https://github.com/phpbb-extensions/cannedmessages/actions/workflows/tests.yml/badge.svg)](https://github.com/phpbb-extensions/cannedmessages/actions)
66

77
## Installation
88

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
"php": ">=8.1",
1919
"composer/installers": "~1.0"
2020
},
21+
"require-dev": {
22+
"phing/phing": "~2.4"
23+
},
2124
"extra": {
2225
"display-name": "Canned Messages",
2326
"soft-require": {

0 commit comments

Comments
 (0)