Skip to content

Commit bb61aca

Browse files
iMattProiMattPro
authored
Merge pull request #42 from phpbb-extensions/3.3.x
Merge 3.3.x into master
2 parents f4ba799 + b31ffe4 commit bb61aca

File tree

3 files changed

+89
-13
lines changed

3 files changed

+89
-13
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 88 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -250,18 +250,37 @@ jobs:
250250
run: .github/setup-database.sh $DB $MYISAM
251251
working-directory: ./phpBB3
252252

253-
- name: Install NPM dependencies
253+
- name: Set up Node.js
254254
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
255255
uses: actions/setup-node@v4
256256
with:
257-
node-version: 20
257+
node-version: 20
258+
259+
- name: Cache NPM dependencies
260+
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
261+
uses: actions/cache@v4
262+
with:
263+
path: ./phpBB3/phpBB/ext/${{ env.EXTNAME }}/node_modules
264+
key: ${{ runner.os }}-node-${{ hashFiles('phpBB3/phpBB/ext/${{ env.EXTNAME }}/package-lock.json') }}
265+
restore-keys: |
266+
${{ runner.os }}-node-
258267
259268
- name: Run npm ci
260269
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
261270
run: npm ci
262271
working-directory: ./phpBB3/phpBB/ext/${{ env.EXTNAME }}
263272

264-
- name: Install composer dependencies
273+
- name: Cache Composer dependencies
274+
if: ${{ inputs.RUN_COMPOSER_INSTALL == '1' }}
275+
uses: actions/cache@v4
276+
with:
277+
path: ./phpBB3/phpBB/ext/${{ env.EXTNAME }}/vendor
278+
key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('phpBB3/phpBB/ext/${{ env.EXTNAME }}/composer.lock') }}
279+
restore-keys: |
280+
${{ runner.os }}-composer-${{ matrix.php }}-
281+
${{ runner.os }}-composer-
282+
283+
- name: Install Composer dependencies
265284
if: ${{ inputs.RUN_COMPOSER_INSTALL == '1' }}
266285
run: composer install
267286
working-directory: ./phpBB3/phpBB/ext/${{ env.EXTNAME }}
@@ -401,18 +420,37 @@ jobs:
401420
run: .github/setup-database.sh $DB $MYISAM
402421
working-directory: ./phpBB3
403422

404-
- name: Install NPM dependencies
423+
- name: Set up Node.js
405424
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
406425
uses: actions/setup-node@v4
407426
with:
408-
node-version: 20
427+
node-version: 20
428+
429+
- name: Cache NPM dependencies
430+
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
431+
uses: actions/cache@v4
432+
with:
433+
path: ./phpBB3/phpBB/ext/${{ env.EXTNAME }}/node_modules
434+
key: ${{ runner.os }}-node-${{ hashFiles('phpBB3/phpBB/ext/${{ env.EXTNAME }}/package-lock.json') }}
435+
restore-keys: |
436+
${{ runner.os }}-node-
409437
410438
- name: Run npm ci
411439
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
412440
run: npm ci
413441
working-directory: ./phpBB3/phpBB/ext/${{ env.EXTNAME }}
414442

415-
- name: Install composer dependencies
443+
- name: Cache Composer dependencies
444+
if: ${{ inputs.RUN_COMPOSER_INSTALL == '1' }}
445+
uses: actions/cache@v4
446+
with:
447+
path: ./phpBB3/phpBB/ext/${{ env.EXTNAME }}/vendor
448+
key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('phpBB3/phpBB/ext/${{ env.EXTNAME }}/composer.lock') }}
449+
restore-keys: |
450+
${{ runner.os }}-composer-${{ matrix.php }}-
451+
${{ runner.os }}-composer-
452+
453+
- name: Install Composer dependencies
416454
if: ${{ inputs.RUN_COMPOSER_INSTALL == '1' }}
417455
run: composer install
418456
working-directory: ./phpBB3/phpBB/ext/${{ env.EXTNAME }}
@@ -523,18 +561,37 @@ jobs:
523561
run: .github/setup-database.sh $DB $MYISAM
524562
working-directory: ./phpBB3
525563

526-
- name: Install NPM dependencies
564+
- name: Set up Node.js
527565
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
528566
uses: actions/setup-node@v4
529567
with:
530-
node-version: 20
568+
node-version: 20
569+
570+
- name: Cache NPM dependencies
571+
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
572+
uses: actions/cache@v4
573+
with:
574+
path: ./phpBB3/phpBB/ext/${{ env.EXTNAME }}/node_modules
575+
key: ${{ runner.os }}-node-${{ hashFiles('phpBB3/phpBB/ext/${{ env.EXTNAME }}/package-lock.json') }}
576+
restore-keys: |
577+
${{ runner.os }}-node-
531578
532579
- name: Run npm ci
533580
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
534581
run: npm ci
535582
working-directory: ./phpBB3/phpBB/ext/${{ env.EXTNAME }}
536583

537-
- name: Install composer dependencies
584+
- name: Cache Composer dependencies
585+
if: ${{ inputs.RUN_COMPOSER_INSTALL == '1' }}
586+
uses: actions/cache@v4
587+
with:
588+
path: ./phpBB3/phpBB/ext/${{ env.EXTNAME }}/vendor
589+
key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('phpBB3/phpBB/ext/${{ env.EXTNAME }}/composer.lock') }}
590+
restore-keys: |
591+
${{ runner.os }}-composer-${{ matrix.php }}-
592+
${{ runner.os }}-composer-
593+
594+
- name: Install Composer dependencies
538595
if: ${{ inputs.RUN_COMPOSER_INSTALL == '1' }}
539596
run: composer install
540597
working-directory: ./phpBB3/phpBB/ext/${{ env.EXTNAME }}
@@ -657,18 +714,37 @@ jobs:
657714
Set-MpPreference -ExclusionPath "${env:PGDATA}" # Exclude PGDATA directory from Windows Defender
658715
Set-MpPreference -DisableRealtimeMonitoring $true
659716
660-
- name: Install NPM dependencies
717+
- name: Set up Node.js
661718
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
662719
uses: actions/setup-node@v4
663720
with:
664-
node-version: 20
721+
node-version: 20
722+
723+
- name: Cache NPM dependencies
724+
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
725+
uses: actions/cache@v4
726+
with:
727+
path: ./phpBB3/phpBB/ext/${{ env.EXTNAME }}/node_modules
728+
key: ${{ runner.os }}-node-${{ hashFiles('phpBB3/phpBB/ext/${{ env.EXTNAME }}/package-lock.json') }}
729+
restore-keys: |
730+
${{ runner.os }}-node-
665731
666732
- name: Run npm ci
667733
if: ${{ inputs.RUN_NPM_INSTALL == '1' }}
668734
run: npm ci
669735
working-directory: .\phpBB3\phpBB\ext\${{ env.EXTNAME }}
670736

671-
- name: Install composer dependencies
737+
- name: Cache Composer dependencies
738+
if: ${{ inputs.RUN_COMPOSER_INSTALL == '1' }}
739+
uses: actions/cache@v4
740+
with:
741+
path: ./phpBB3/phpBB/ext/${{ env.EXTNAME }}/vendor
742+
key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('phpBB3/phpBB/ext/${{ env.EXTNAME }}/composer.lock') }}
743+
restore-keys: |
744+
${{ runner.os }}-composer-${{ matrix.php }}-
745+
${{ runner.os }}-composer-
746+
747+
- name: Install Composer dependencies
672748
if: ${{ inputs.RUN_COMPOSER_INSTALL == '1' }}
673749
run: composer install
674750
working-directory: .\phpBB3\phpBB\ext\${{ env.EXTNAME }}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# phpBB Extension Test Framework
22

3-
<img align="left" src="detective-bertie.png" alt="Detective Bertie running diagnostics" height="200" width="200">
3+
<img align="left" src="https://raw.githubusercontent.com/phpbb/website-assets/master/images/images/extensions/detective-bertie.png" alt="Detective Bertie running diagnostics" height="200" width="200">
44

55
This repository provides a reusable GitHub Actions workflow for phpBB extension developers.
66

‎detective-bertie.png‎

-332 KB
Binary file not shown.

0 commit comments

Comments
 (0)