Skip to content

Commit 475d963

Browse files
authored
Merge pull request #22 from iMattPro/branch-optional
Make PHPBB_BRANCH optional
2 parents dadffc1 + 72545b9 commit 475d963

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

.github/workflows/tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ on:
77
required: true
88
type: string
99
PHPBB_BRANCH:
10-
required: true
10+
required: false
11+
default: '3.3.x'
1112
type: string
1213
SNIFF:
1314
required: false

README.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,27 +46,24 @@ on:
4646
jobs:
4747
call-tests:
4848
name: Extension tests
49-
uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@3.3.x # Must match PHPBB_BRANCH
49+
uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@3.3.x # The phpBB branch to run tests with
5050
with:
5151
EXTNAME: acme/demo # Your extension vendor/package name
52-
PHPBB_BRANCH: 3.3.x # The phpBB branch to run tests on
5352
secrets:
5453
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} # Do not edit or remove this
5554
```
5655
5756
### Branches
5857
59-
Use the branch that matches the phpBB version you're developing for.
58+
Use the test-framework branch that matches the phpBB version you're developing for:
6059
6160
- `3.3.x`: Targets the phpBB 3.3.x release line.
6261
- `master`: Targets the latest development version of phpBB (`master` branch).
6362

64-
> ‼️ Whichever branch you choose here, be sure to use the **same value** for both the `PHPBB_BRANCH` and in the `uses:` line after the `@` symbol. For example, if you're targeting the `3.3.x` branch:
63+
> ‼️ Whichever branch of this framework you choose, be sure it is appended to the `uses:` line after the `@` symbol. For example, if you're targeting the `3.3.x` branch:
6564
>
6665
> ```yaml
6766
> uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@3.3.x
68-
> with:
69-
> PHPBB_BRANCH: 3.3.x
7067
> ```
7168

7269
### Requirements
@@ -84,11 +81,17 @@ call-tests:
8481
uses: phpbb-extensions/test-framework/.github/workflows/tests.yml@3.3.x
8582
with:
8683
EXTNAME: acme/demo # Your extension vendor/package name
87-
PHPBB_BRANCH: 3.3.x # The phpBB branch to run tests on
8884
8985
# OPTIONAL CONFIGURATIONS BELOW
9086
# The following arguments are optional and can be omitted if not needed.
9187
88+
# The phpBB branch to use when running tests.
89+
# Default is '3.3.x', which this framework is designed for.
90+
# If using a different branch, ensure it's compatible with 3.3.x.
91+
# To test with phpBB's master branch, refer to the Branches section of this README.
92+
# Default: '3.3.x'
93+
PHPBB_BRANCH: '3.3.x'
94+
9295
# Run phpBB's EPV (Extension Pre Validator)? 1 (yes) or 0 (no)
9396
# Default: 1
9497
EPV: 1

0 commit comments

Comments
 (0)