Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2021-11-14 10:11:32 +01:00
commit 206c405668
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -130,6 +130,8 @@ jobs:
db: "mysql:5.7"
- php: '8.1'
db: "mysql:5.7"
- php: '8.2'
db: "mysql:5.7"
name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
@ -253,6 +255,10 @@ jobs:
db: "postgres:12"
- php: '8.0'
db: "postgres:13"
- php: '8.1'
db: "postgres:14"
- php: '8.2'
db: "postgres:14"
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
@ -442,7 +448,7 @@ jobs:
# Test with IIS & PostgreSQL on Windows
windows-tests:
runs-on: windows-2016
runs-on: windows-latest
strategy:
matrix:
include:
@ -455,6 +461,9 @@ jobs:
- php: '8.1'
db: "postgres"
type: 'unit'
- php: '8.2'
db: "postgres"
type: 'unit'
- php: '7.4'
db: "postgres"
type: 'functional'
@ -464,6 +473,9 @@ jobs:
- php: '8.1'
db: "postgres"
type: 'functional'
- php: '8.2'
db: "postgres"
type: 'functional'
name: Windows - PHP ${{ matrix.php }} - ${{ matrix.db }} - ${{ matrix.type }}
@ -553,6 +565,7 @@ jobs:
}
[System.Environment]::SetEnvironmentVariable('PATH',$Env:PATH+";${env:PGBIN}")
$env:PGPASSWORD = 'root'
psql -c hot_standby=on
psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres
psql -c 'create database phpbb_tests;' -U postgres
Set-MpPreference -ExclusionPath "${env:PGDATA}" # Exclude PGDATA directory from Windows Defender