Skip to content

Commit 1539c0c

Browse files
authored
Merge pull request #178 from iMattPro/updates
Maintenance
2 parents 9e46a16 + bac7e55 commit 1539c0c

2 files changed

Lines changed: 17 additions & 13 deletions

File tree

.github/workflows/tests.yml

Lines changed: 16 additions & 12 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:
@@ -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

@@ -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,7 +242,7 @@ 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:
@@ -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

@@ -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

@@ -354,7 +358,7 @@ jobs:
354358

355359
# START Other Tests Job (SQLite 3 and mssql)
356360
other-tests:
357-
runs-on: ubuntu-20.04
361+
runs-on: ubuntu-22.04
358362
strategy:
359363
matrix:
360364
include:
@@ -396,14 +400,14 @@ 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

ext.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected function check_phpbb_version()
5959
*/
6060
protected function check_php_version()
6161
{
62-
return phpbb_version_compare(PHP_VERSION, '5.5.0', '>=');
62+
return PHP_VERSION_ID >= 50500;
6363
}
6464

6565
/**

0 commit comments

Comments
 (0)