[ticket/17193] Run unit tests on single runners again

PHPBB3-17193
This commit is contained in:
Marc Alexander 2023-09-22 11:07:41 +02:00
parent 89a4102eda
commit 1ee4d8387b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 3 additions and 17 deletions

View file

@ -100,7 +100,6 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
type: ['unit', 'functional']
php: ['8.1', '8.2', '8.3'] php: ['8.1', '8.2', '8.3']
db: [ db: [
'mariadb:10.2', 'mariadb:10.2',
@ -116,12 +115,6 @@ jobs:
'mysql:8.1' 'mysql:8.1'
] ]
include: include:
- php: '8.1'
db: 'mysql:5.7'
type: 'unit'
- php: '8.1'
db: 'mysql:5.7'
type: 'functional'
- php: '8.1' - php: '8.1'
db: "mysql:5.7" db: "mysql:5.7"
db_alias: "MySQL Slow Tests" db_alias: "MySQL Slow Tests"
@ -223,16 +216,9 @@ jobs:
- name: Run unit tests - name: Run unit tests
env: env:
DB: ${{steps.database-type.outputs.db}} DB: ${{steps.database-type.outputs.db}}
if: ${{ matrix.SLOWTESTS != 1 && matrix.NOTESTS != 1 && matrix.type == 'unit' }} if: ${{ matrix.SLOWTESTS != 1 && matrix.NOTESTS != 1 }}
run: | run: |
phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --verbose --stop-on-error --exclude-group functional,slow phpBB/vendor/bin/phpunit --configuration .github/phpunit-$DB-github.xml --verbose --stop-on-error
- 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
- name: Slow tests - name: Slow tests
env: env:

2
phpBB/composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "0c305d521f2db3eec61dcef5b8359047", "content-hash": "fec6e6e713d3e0d587befaede71cc570",
"packages": [ "packages": [
{ {
"name": "bantu/ini-get-wrapper", "name": "bantu/ini-get-wrapper",