Skip to content

Commit a6ea8fa

Browse files
iMattProiMattPro
authored
Merge pull request #69 from iMattPro/updates
Update test framework for master branch
2 parents 24bcba5 + 5bef6a1 commit a6ea8fa

File tree

2 files changed

+37
-39
lines changed

2 files changed

+37
-39
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ jobs:
103103
sudo apt-get update -y --allow-releaseinfo-change
104104
105105
- name: Checkout phpBB
106-
uses: actions/checkout@v4
106+
uses: actions/checkout@v6
107107
with:
108108
repository: phpbb/phpbb
109109
ref: ${{ env.PHPBB_BRANCH }}
110110
path: phpBB4
111111

112112
- name: Checkout extension
113-
uses: actions/checkout@v4
113+
uses: actions/checkout@v6
114114
with:
115115
path: phpBB4/phpBB/ext/${{ env.EXTNAME }}
116116

@@ -175,7 +175,7 @@ jobs:
175175
strategy:
176176
matrix:
177177
php: ${{ fromJSON(inputs.PHP_VERSION_MATRIX) }}
178-
db: ['mysql:8.0', 'mariadb:10.5']
178+
db: ['mysql:8.4', 'mysql:9.4']
179179
include:
180180
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
181181
db: 'mariadb:10.2'
@@ -192,15 +192,13 @@ jobs:
192192
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
193193
db: 'mariadb:10.11'
194194
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
195-
db: 'mysql:8.1'
196-
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
197-
db: 'mysql:5.7'
195+
db: 'mysql:8.0'
198196
db_alias: 'MyISAM Tests'
199197
MYISAM: 1
200198
- php: ${{ startsWith(inputs.PRIMARY_PHP_VERSION, '7') && '7.4' || inputs.PRIMARY_PHP_VERSION }}
201-
db: 'mysql:5.7'
199+
db: 'mysql:8.0'
202200
COVERAGE: ${{ inputs.CODECOV == '1' && '1' || '0' }}
203-
db_alias: ${{ inputs.CODECOV == '1' && 'mysql:5.7 with Coverage' || 'mysql:5.7' }}
201+
db_alias: ${{ inputs.CODECOV == '1' && 'mysql:8.0 with Coverage' || 'mysql:8.0' }}
204202

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

@@ -234,14 +232,14 @@ jobs:
234232
sudo apt-get update -y --allow-releaseinfo-change
235233
236234
- name: Checkout phpBB
237-
uses: actions/checkout@v4
235+
uses: actions/checkout@v6
238236
with:
239237
repository: phpbb/phpbb
240238
ref: ${{ env.PHPBB_BRANCH }}
241239
path: phpBB4
242240

243241
- name: Checkout extension
244-
uses: actions/checkout@v4
242+
uses: actions/checkout@v6
245243
with:
246244
path: phpBB4/phpBB/ext/${{ env.EXTNAME }}
247245

@@ -277,13 +275,13 @@ jobs:
277275

278276
- name: Set up Node.js
279277
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
280-
uses: actions/setup-node@v4
278+
uses: actions/setup-node@v6
281279
with:
282-
node-version: 20
280+
node-version: 24
283281

284282
- name: Cache NPM dependencies
285283
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
286-
uses: actions/cache@v4
284+
uses: actions/cache@v5
287285
with:
288286
path: ./phpBB4/phpBB/ext/${{ env.EXTNAME }}/node_modules
289287
key: ${{ runner.os }}-node-${{ hashFiles('phpBB4/phpBB/ext/${{ env.EXTNAME }}/package-lock.json') }}
@@ -297,7 +295,7 @@ jobs:
297295

298296
- name: Cache Composer dependencies
299297
if: ${{ inputs.RUN_COMPOSER_INSTALL == '1' }}
300-
uses: actions/cache@v4
298+
uses: actions/cache@v5
301299
with:
302300
path: ./phpBB4/phpBB/ext/${{ env.EXTNAME }}/vendor
303301
key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('phpBB4/phpBB/ext/${{ env.EXTNAME }}/composer.lock') }}
@@ -312,7 +310,7 @@ jobs:
312310

313311
- name: Checkout test-framework
314312
if: ${{ matrix.COVERAGE == '1' }}
315-
uses: actions/checkout@v4
313+
uses: actions/checkout@v6
316314
with:
317315
repository: phpbb-extensions/test-framework
318316
ref: ${{ env.PHPBB_BRANCH }}
@@ -374,10 +372,8 @@ jobs:
374372
strategy:
375373
matrix:
376374
php: ${{ fromJSON(inputs.PHP_VERSION_MATRIX) }}
377-
db: ['postgres:15']
375+
db: ['postgres:9.5']
378376
include:
379-
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
380-
db: 'postgres:9.5'
381377
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
382378
db: 'postgres:9.6'
383379
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
@@ -390,6 +386,8 @@ jobs:
390386
db: 'postgres:13'
391387
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
392388
db: 'postgres:14'
389+
- php: ${{ inputs.PRIMARY_PHP_VERSION }}
390+
db: 'postgres:15'
393391

394392
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
395393

@@ -425,14 +423,14 @@ jobs:
425423
sudo apt-get update -y --allow-releaseinfo-change
426424
427425
- name: Checkout phpBB
428-
uses: actions/checkout@v4
426+
uses: actions/checkout@v6
429427
with:
430428
repository: phpbb/phpbb
431429
ref: ${{ env.PHPBB_BRANCH }}
432430
path: phpBB4
433431

434432
- name: Checkout extension
435-
uses: actions/checkout@v4
433+
uses: actions/checkout@v6
436434
with:
437435
path: phpBB4/phpBB/ext/${{ env.EXTNAME }}
438436

@@ -468,13 +466,13 @@ jobs:
468466

469467
- name: Set up Node.js
470468
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
471-
uses: actions/setup-node@v4
469+
uses: actions/setup-node@v6
472470
with:
473-
node-version: 20
471+
node-version: 24
474472

475473
- name: Cache NPM dependencies
476474
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
477-
uses: actions/cache@v4
475+
uses: actions/cache@v5
478476
with:
479477
path: ./phpBB4/phpBB/ext/${{ env.EXTNAME }}/node_modules
480478
key: ${{ runner.os }}-node-${{ hashFiles('phpBB4/phpBB/ext/${{ env.EXTNAME }}/package-lock.json') }}
@@ -488,7 +486,7 @@ jobs:
488486

489487
- name: Cache Composer dependencies
490488
if: ${{ inputs.RUN_COMPOSER_INSTALL == '1' }}
491-
uses: actions/cache@v4
489+
uses: actions/cache@v5
492490
with:
493491
path: ./phpBB4/phpBB/ext/${{ env.EXTNAME }}/vendor
494492
key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('phpBB4/phpBB/ext/${{ env.EXTNAME }}/composer.lock') }}
@@ -573,14 +571,14 @@ jobs:
573571
sudo apt-get update -y --allow-releaseinfo-change
574572
575573
- name: Checkout phpBB
576-
uses: actions/checkout@v4
574+
uses: actions/checkout@v6
577575
with:
578576
repository: phpbb/phpbb
579577
ref: ${{ env.PHPBB_BRANCH }}
580578
path: phpBB4
581579

582580
- name: Checkout extension
583-
uses: actions/checkout@v4
581+
uses: actions/checkout@v6
584582
with:
585583
path: phpBB4/phpBB/ext/${{ env.EXTNAME }}
586584

@@ -621,13 +619,13 @@ jobs:
621619

622620
- name: Set up Node.js
623621
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
624-
uses: actions/setup-node@v4
622+
uses: actions/setup-node@v6
625623
with:
626-
node-version: 20
624+
node-version: 24
627625

628626
- name: Cache NPM dependencies
629627
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
630-
uses: actions/cache@v4
628+
uses: actions/cache@v5
631629
with:
632630
path: ./phpBB4/phpBB/ext/${{ env.EXTNAME }}/node_modules
633631
key: ${{ runner.os }}-node-${{ hashFiles('phpBB4/phpBB/ext/${{ env.EXTNAME }}/package-lock.json') }}
@@ -641,7 +639,7 @@ jobs:
641639

642640
- name: Cache Composer dependencies
643641
if: ${{ inputs.RUN_COMPOSER_INSTALL == '1' }}
644-
uses: actions/cache@v4
642+
uses: actions/cache@v5
645643
with:
646644
path: ./phpBB4/phpBB/ext/${{ env.EXTNAME }}/vendor
647645
key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('phpBB4/phpBB/ext/${{ env.EXTNAME }}/composer.lock') }}
@@ -696,14 +694,14 @@ jobs:
696694
git config --system core.eol lf
697695
698696
- name: Checkout phpBB
699-
uses: actions/checkout@v4
697+
uses: actions/checkout@v6
700698
with:
701699
repository: phpbb/phpbb
702700
ref: ${{ env.PHPBB_BRANCH }}
703701
path: phpBB4
704702

705703
- name: Checkout extension
706-
uses: actions/checkout@v4
704+
uses: actions/checkout@v6
707705
with:
708706
path: phpBB4/phpBB/ext/${{ env.EXTNAME }}
709707

@@ -781,13 +779,13 @@ jobs:
781779
782780
- name: Set up Node.js
783781
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
784-
uses: actions/setup-node@v4
782+
uses: actions/setup-node@v6
785783
with:
786-
node-version: 20
784+
node-version: 24
787785

788786
- name: Cache NPM dependencies
789787
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
790-
uses: actions/cache@v4
788+
uses: actions/cache@v5
791789
with:
792790
path: ./phpBB4/phpBB/ext/${{ env.EXTNAME }}/node_modules
793791
key: ${{ runner.os }}-node-${{ hashFiles('phpBB4/phpBB/ext/${{ env.EXTNAME }}/package-lock.json') }}
@@ -801,7 +799,7 @@ jobs:
801799

802800
- name: Cache Composer dependencies
803801
if: ${{ inputs.RUN_COMPOSER_INSTALL == '1' }}
804-
uses: actions/cache@v4
802+
uses: actions/cache@v5
805803
with:
806804
path: ./phpBB4/phpBB/ext/${{ env.EXTNAME }}/vendor
807805
key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('phpBB4/phpBB/ext/${{ env.EXTNAME }}/composer.lock') }}

‎.github/workflows/validate_workflows.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717

1818
steps:
1919
- name: Checkout repository
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v6
2121

2222
# Step 1: Run actionlint for logic/deprecation checks
2323
- name: Run actionlint
24-
uses: raven-actions/actionlint@v1
24+
uses: raven-actions/actionlint@v2
2525

2626
# Step 2: Set up Python for schema validation
2727
- name: Set up Python
28-
uses: actions/setup-python@v5
28+
uses: actions/setup-python@v6
2929
with:
3030
python-version: "3.x"
3131

0 commit comments

Comments
 (0)