From 1ee4d8387b1e55fe611a0d81b5e17334edfb8d50 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 22 Sep 2023 11:07:41 +0200
Subject: [PATCH] [ticket/17193] Run unit tests on single runners again

PHPBB3-17193
---
 .github/workflows/tests.yml | 18 ++----------------
 phpBB/composer.lock         |  2 +-
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1ae1303623..48ee360064 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -100,7 +100,6 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                type: ['unit', 'functional']
                 php: ['8.1', '8.2', '8.3']
                 db: [
                         'mariadb:10.2',
@@ -116,12 +115,6 @@ jobs:
                         'mysql:8.1'
                 ]
                 include:
-                    - php: '8.1'
-                      db: 'mysql:5.7'
-                      type: 'unit'
-                    - php: '8.1'
-                      db: 'mysql:5.7'
-                      type: 'functional'
                     - php: '8.1'
                       db: "mysql:5.7"
                       db_alias: "MySQL Slow Tests"
@@ -223,16 +216,9 @@ jobs:
             - name: Run unit tests
               env:
                   DB: ${{steps.database-type.outputs.db}}
-              if: ${{ matrix.SLOWTESTS != 1 && matrix.NOTESTS != 1 && matrix.type == 'unit' }}
+              if: ${{ matrix.SLOWTESTS != 1 && matrix.NOTESTS != 1 }}
               run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --verbose --stop-on-error --exclude-group functional,slow
-
-            - name: Run functional tests
-              env:
-                  DB: ${{steps.database-type.outputs.db}}
-              if: ${{ matrix.SLOWTESTS != 1 && matrix.NOTESTS != 1 && matrix.type == 'functional' }}
-              run: |
-                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --verbose --stop-on-error --group functional
+                  phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --verbose --stop-on-error
 
             - name: Slow tests
               env:
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index 73b27c5c52..7d4997d6ca 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0c305d521f2db3eec61dcef5b8359047",
+    "content-hash": "fec6e6e713d3e0d587befaede71cc570",
     "packages": [
         {
             "name": "bantu/ini-get-wrapper",