Skip to content

Merge 3.3.x into master #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iMattPro merged 4 commits into from
May 19, 2025
Merged

Merge 3.3.x into master #48

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
174b460
Fix issue with empty strings
iMattPro May 18, 2025
5629de2
Merge pull request #46 from iMattPro/fixes
iMattPro May 18, 2025
3a2b04b
Fix steps with missing names
iMattPro May 19, 2025
cb2249a
Merge pull request #47 from iMattPro/fixes
iMattPro May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 32 additions & 12 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,8 @@ jobs:
with:
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}

- id: database-type
- name: Set database type
id: database-type
env:
MATRIX_DB: ${{ matrix.db }}
run: |
Expand Down Expand Up @@ -316,11 +317,18 @@ jobs:
DB: ${{steps.database-type.outputs.db}}
COVERAGE: ${{ matrix.COVERAGE == '1' && '1' || '0' }}
run: |
args=()
if [ "$COVERAGE" == "1" ]; then
args+=(--coverage-clover build/logs/clover.xml)
fi
if [ "$FUNCTIONAL_TESTS" == "0" ]; then
args+=(--exclude-group functional)
fi

phpBB/vendor/bin/phpunit \
--configuration "phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml" \
--bootstrap ./tests/bootstrap.php \
"$( [[ "$COVERAGE" == "1" ]] && echo "--coverage-clover build/logs/clover.xml" )" \
"$( [[ "$FUNCTIONAL_TESTS" == "0" ]] && echo "--exclude-group functional" )"
"${args[@]}"
working-directory: ./phpBB3

- name: Send code coverage
Expand Down Expand Up @@ -393,7 +401,8 @@ jobs:
with:
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}

- id: database-type
- name: Set database type
id: database-type
env:
MATRIX_DB: ${{ matrix.db }}
run: |
Expand Down Expand Up @@ -465,10 +474,15 @@ jobs:
env:
DB: ${{steps.database-type.outputs.db}}
run: |
phpBB/vendor/bin/phpunit \
--configuration "phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml" \
--bootstrap ./tests/bootstrap.php \
"$( [[ "$FUNCTIONAL_TESTS" == "0" ]] && echo "--exclude-group functional" )"
args=()
if [ "$FUNCTIONAL_TESTS" == "0" ]; then
args+=(--exclude-group functional)
fi

phpBB/vendor/bin/phpunit \
--configuration "phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml" \
--bootstrap ./tests/bootstrap.php \
"${args[@]}"
working-directory: ./phpBB3
# END PostgreSQL Job

Expand Down Expand Up @@ -528,7 +542,8 @@ jobs:
with:
path: phpBB3/phpBB/ext/${{ env.EXTNAME }}

- id: database-type
- name: Set database type
id: database-type
env:
MATRIX_DB: ${{ matrix.db }}
run: |
Expand Down Expand Up @@ -605,10 +620,15 @@ jobs:
env:
DB: ${{steps.database-type.outputs.db}}
run: |
args=()
if [ "$FUNCTIONAL_TESTS" == "0" ]; then
args+=(--exclude-group functional)
fi

phpBB/vendor/bin/phpunit \
--configuration "phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml" \
--bootstrap ./tests/bootstrap.php \
"$( [[ "$FUNCTIONAL_TESTS" == "0" ]] && echo "--exclude-group functional" )"
--configuration "phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml" \
--bootstrap ./tests/bootstrap.php \
"${args[@]}"
working-directory: ./phpBB3
# END Other Tests Job

Expand Down