From 1ee4d8387b1e55fe611a0d81b5e17334edfb8d50 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 22 Sep 2023 11:07:41 +0200 Subject: [PATCH 1/4] [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", From 19d7e5ffefcb59620522eb099e91298df9453a4d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 22 Sep 2023 11:14:24 +0200 Subject: [PATCH 2/4] [ticket/17193] Reduce amount of runners PHPBB3-17193 --- .github/workflows/tests.yml | 62 +++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 48ee360064..847d8d45df 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -100,33 +100,47 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: ['8.1', '8.2', '8.3'] - db: [ - 'mariadb:10.2', - 'mariadb:10.3', - 'mariadb:10.4', - 'mariadb:10.6', - 'mariadb:10.9', - 'mariadb:10.10', - 'mariadb:10.11', - # 'mariadb:11.0' # currently disabled - 'mysql:5.7', - 'mysql:8.0', - 'mysql:8.1' - ] include: + - php: '8.1' + db: "mariadb:10.2" + - php: '8.1' + db: "mariadb:10.3" + - php: '8.1' + db: "mariadb:10.4" + - php: '8.1' + db: "mariadb:10.6" + - php: '8.1' + db: "mariadb:10.9" + - php: '8.1' + db: "mariadb:10.10" + - php: '8.1' + db: "mariadb:10.11" + #- php: '8.1' # currently disabled + # db: "mariadb:11.0" - php: '8.1' db: "mysql:5.7" db_alias: "MySQL Slow Tests" - type: 'slow' SLOWTESTS: 1 - - php: '8.1' + - php: '7.3' db: "mysql:5.7" db_alias: "MyISAM Tests" - type: 'MyISAM' MYISAM: 1 + - php: '8.1' + db: "mysql:5.7" + - php: '8.1' + db: "mysql:8.0" + - php: '8.1' + db: "mysql:8.1" + - php: '8.2' + db: "mysql:8.0" + - php: '8.2' + db: "mariadb:10.2" + - php: '8.3' + db: "mysql:5.7" + - php: '8.3' + db: "mariadb:10.2" - name: ${{ matrix.type }} - PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} + name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} services: mysql: @@ -250,15 +264,9 @@ jobs: - php: '8.1' db: "postgres:15" - php: '8.2' - db: "postgres:12" - - php: '8.2' - db: "postgres:13" - - php: '8.2' - db: "postgres:14" - - php: '8.2' - db: "postgres:15" - #- php: '8.3' - # db: "postgres:15" + db: "postgres:9.5" + - php: '8.3' + db: "postgres:9.5" name: PHP ${{ matrix.php }} - ${{ matrix.db }} From 8143ec606052ca3c465a195d889f824c1b8c9b5a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 22 Sep 2023 11:27:18 +0200 Subject: [PATCH 3/4] [ticket/17193] Fix invalid PHP versions PHPBB3-17193 --- .github/workflows/tests.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 847d8d45df..70eb6a0017 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -115,13 +115,15 @@ jobs: db: "mariadb:10.10" - php: '8.1' db: "mariadb:10.11" - #- php: '8.1' # currently disabled - # db: "mariadb:11.0" + - php: '8.1' + db: "mariadb:11.0" + - php: '8.1' + db: "mariadb:11.1" - php: '8.1' db: "mysql:5.7" db_alias: "MySQL Slow Tests" SLOWTESTS: 1 - - php: '7.3' + - php: '8.1' db: "mysql:5.7" db_alias: "MyISAM Tests" MYISAM: 1 From 316b061de169759ba33ada7b279487f36c949533 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 22 Sep 2023 11:49:52 +0200 Subject: [PATCH 4/4] [ticket/17193] Remove mariadb versions not working right now PHPBB3-17193 --- .github/workflows/tests.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 70eb6a0017..982ca66a2a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -115,10 +115,6 @@ jobs: db: "mariadb:10.10" - php: '8.1' db: "mariadb:10.11" - - php: '8.1' - db: "mariadb:11.0" - - php: '8.1' - db: "mariadb:11.1" - php: '8.1' db: "mysql:5.7" db_alias: "MySQL Slow Tests"