Merge pull request #40 from iMattPro/update-master

Merge 3.3.x into master

Author: iMattPro

.github/workflows/tests.yml

@@ -293,19 +293,11 @@ jobs:
                   DB: ${{steps.database-type.outputs.db}}
                   COVERAGE: ${{ matrix.COVERAGE == '1' && '1' || '0' }}
               run: |
-                  if [ $COVERAGE == '1' ]
-                  then
-                      phpBB/vendor/bin/phpunit \
-                          --configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml \
-                          --bootstrap ./tests/bootstrap.php \
-                          --coverage-clover build/logs/clover.xml \
-                          $([[ "$FUNCTIONAL_TESTS" == "0" ]] && echo "--exclude-group functional")
-                  else
-                      phpBB/vendor/bin/phpunit \
-                          --configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml \
-                          --bootstrap ./tests/bootstrap.php \
-                          $([[ "$FUNCTIONAL_TESTS" == "0" ]] && echo "--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")
               working-directory: ./phpBB3
 
             - name: Send code coverage

.github/workflows/trigger_acme_tests.yml

@@ -0,0 +1,22 @@
+name: Trigger Acme Demo Tests
+
+on:
+  push:
+    branches:
+      - 3.3.x
+
+jobs:
+  dispatch:
+    if: github.repository == 'phpbb-extensions/test-framework'  # only run if it's the main (source) repo
+    name: Trigger tests in acme demo extension
+    runs-on: ubuntu-latest
+    steps:
+      - uses: convictional/[email protected]
+        with:
+          owner: phpbb
+          repo: phpbb-ext-acme-demo
+          ref: master
+          github_user: iMattPro  # The name of the github user whose access token is being used to trigger the workflow.
+          github_token: ${{ secrets.ACME_DEMO_PAT }}
+          workflow_file_name: tests.yml
+          wait_workflow: false