From 174b460c28c2f4e668e20b566d8a743498420784 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 18 May 2025 16:48:31 -0700 Subject: [PATCH 1/2] Fix issue with empty strings --- .github/workflows/tests.yml | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b968690..9ed3c74 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -316,11 +316,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 @@ -465,10 +472,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 @@ -605,10 +617,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 From 3a2b04b5025302b12a69d2aa475967a23918ca01 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 18 May 2025 17:06:30 -0700 Subject: [PATCH 2/2] Fix steps with missing names --- .github/workflows/tests.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9ed3c74..5cc6475 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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: | @@ -400,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: | @@ -540,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: |