Skip to content

Commit a0e31bc

Browse files
iMattProiMattPro
committed
Merge branch 'master' into dev/4.0
2 parents 3fc6fde + 9cd33ea commit a0e31bc

File tree

3 files changed

+37
-33
lines changed

3 files changed

+37
-33
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 35 additions & 31 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,28 +89,26 @@ 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:
96-
- php: '7.1'
96+
- php: '7.2'
9797
db: "mariadb:10.1"
98-
- php: '7.1'
98+
- php: '7.2'
9999
db: "mariadb:10.2"
100-
- php: '7.1'
100+
- php: '7.2'
101101
db: "mariadb:10.3"
102-
- php: '7.1'
102+
- php: '7.2'
103103
db: "mariadb:10.4"
104-
- php: '7.1'
104+
- php: '7.2'
105105
db: "mariadb:10.5"
106-
- php: '7.1'
106+
- php: '7.2'
107107
db: "mysql:5.6"
108108
db_alias: "MyISAM Tests"
109109
MYISAM: 1
110-
- php: '7.1'
110+
- php: '7.2'
111111
db: "mysql:5.6"
112-
- php: '7.1'
113-
db: "mysql:5.7"
114112
- php: '7.2'
115113
db: "mysql:5.7"
116114
COVERAGE: 1
@@ -127,6 +125,10 @@ jobs:
127125
db: "mysql:5.7"
128126
- php: '8.2'
129127
db: "mysql:5.7"
128+
- php: '8.3'
129+
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

@@ -156,14 +158,14 @@ jobs:
156158

157159
steps:
158160
- name: Checkout phpBB
159-
uses: actions/checkout@v3
161+
uses: actions/checkout@v4
160162
with:
161163
repository: phpbb/phpbb
162164
ref: ${{ env.PHPBB_BRANCH }}
163165
path: phpBB3
164166

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

@@ -240,22 +242,20 @@ jobs:
240242

241243
# START PostgreSQL Job
242244
postgres-tests:
243-
runs-on: ubuntu-20.04
245+
runs-on: ubuntu-22.04
244246
strategy:
245247
matrix:
246248
include:
247-
- php: '7.1'
249+
- php: '7.2'
248250
db: "postgres:9.5"
249-
- php: '7.1'
251+
- php: '7.2'
250252
db: "postgres:9.6"
251-
- php: '7.1'
253+
- php: '7.2'
252254
db: "postgres:10"
253-
- php: '7.1'
255+
- php: '7.2'
254256
db: "postgres:11"
255-
- php: '7.1'
257+
- php: '7.2'
256258
db: "postgres:12"
257-
- php: '7.1'
258-
db: "postgres:13"
259259
- php: '7.2'
260260
db: "postgres:13"
261261
- php: '7.3'
@@ -270,6 +270,10 @@ jobs:
270270
db: "postgres:14"
271271
- php: '8.2'
272272
db: "postgres:14"
273+
- php: '8.3'
274+
db: "postgres:14"
275+
- php: '8.4'
276+
db: "postgres:14"
273277

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

@@ -301,14 +305,14 @@ jobs:
301305

302306
steps:
303307
- name: Checkout phpBB
304-
uses: actions/checkout@v3
308+
uses: actions/checkout@v4
305309
with:
306310
repository: phpbb/phpbb
307311
ref: ${{ env.PHPBB_BRANCH }}
308312
path: phpBB3
309313

310314
- name: Checkout extension
311-
uses: actions/checkout@v3
315+
uses: actions/checkout@v4
312316
with:
313317
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
314318

@@ -358,20 +362,20 @@ jobs:
358362
strategy:
359363
matrix:
360364
include:
361-
- php: '7.1'
365+
- php: '7.2'
362366
db: "sqlite3"
363367
- php: '7.2'
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"
@@ -396,22 +400,22 @@ jobs:
396400

397401
steps:
398402
- name: Checkout phpBB
399-
uses: actions/checkout@v3
403+
uses: actions/checkout@v4
400404
with:
401405
repository: phpbb/phpbb
402406
ref: ${{ env.PHPBB_BRANCH }}
403407
path: phpBB3
404408

405409
- name: Checkout extension
406-
uses: actions/checkout@v3
410+
uses: actions/checkout@v4
407411
with:
408412
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}
409413

410414
- id: database-type
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

‎README.md‎

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

33
A phpBB official extension that allows administrators to easily add Google Analytics to their forums.
44

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

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"composer/installers": "~1.0"
4040
},
4141
"require-dev": {
42-
"phing/phing": "2.4.*"
42+
"phing/phing": "~2.4"
4343
},
4444
"extra": {
4545
"display-name": "Google Analytics",

0 commit comments

Comments
 (0)