makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6535 from marc1706/ticket/17193

Browse source 
[ticket/17193] Reduce amount of unit test runners
This commit is contained in:
Derk 2023-09-22 12:59:31 +02:00 • committed by GitHub
commit 276df0a1e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
.github/workflows/tests.yml vendored
View file

@ -100,40 +100,45 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
type: ['unit', 'functional']
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: include:
- php: '8.1' - php: '8.1'
db: 'mysql:5.7' db: "mariadb:10.2"
type: 'unit'
- php: '8.1' - php: '8.1'
db: 'mysql:5.7' db: "mariadb:10.3"
type: 'functional' - 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' - php: '8.1'
db: "mysql:5.7" db: "mysql:5.7"
db_alias: "MySQL Slow Tests" db_alias: "MySQL Slow Tests"
type: 'slow'
SLOWTESTS: 1 SLOWTESTS: 1
- php: '8.1' - php: '8.1'
db: "mysql:5.7" db: "mysql:5.7"
db_alias: "MyISAM Tests" db_alias: "MyISAM Tests"
type: 'MyISAM'
MYISAM: 1 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: services:
mysql: mysql:
@ -223,16 +228,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:
@ -264,15 +262,9 @@ jobs:
- php: '8.1' - php: '8.1'
db: "postgres:15" db: "postgres:15"
- php: '8.2' - php: '8.2'
db: "postgres:12" db: "postgres:9.5"
- php: '8.2' - php: '8.3'
db: "postgres:13" db: "postgres:9.5"
- php: '8.2'
db: "postgres:14"
- php: '8.2'
db: "postgres:15"
#- php: '8.3'
# db: "postgres:15"
name: PHP ${{ matrix.php }} - ${{ matrix.db }} name: PHP ${{ matrix.php }} - ${{ matrix.db }}

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",