mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Fix pgsql and mysql tests on GitHub actions
The tests accidentally stopped running on PHP 8.3+. Closes GH-12475
This commit is contained in:
parent
7da6c0f1db
commit
f42cef6675
3 changed files with 8 additions and 10 deletions
6
.github/actions/test-linux/action.yml
vendored
6
.github/actions/test-linux/action.yml
vendored
|
@ -31,8 +31,10 @@ runs:
|
||||||
export PDO_OCI_TEST_USER="system"
|
export PDO_OCI_TEST_USER="system"
|
||||||
export PDO_OCI_TEST_PASS="pass"
|
export PDO_OCI_TEST_PASS="pass"
|
||||||
export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
|
export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
|
||||||
export PGSQL_TEST_CONNSTR="host=postgres dbname=test port=5432 user=postgres password=postgres"
|
export PGSQL_TEST_CONNSTR="host=localhost dbname=test port=5432 user=postgres password=postgres"
|
||||||
export PDO_PGSQL_TEST_DSN="host=postgres dbname=test port=5432 user=postgres password=postgres"
|
if [[ -z "$PDO_PGSQL_TEST_DSN" ]]; then
|
||||||
|
export PDO_PGSQL_TEST_DSN="pgsql:host=localhost port=5432 dbname=test user=postgres password=postgres"
|
||||||
|
fi
|
||||||
export ODBC_TEST_USER="odbc_test"
|
export ODBC_TEST_USER="odbc_test"
|
||||||
export ODBC_TEST_PASS="password"
|
export ODBC_TEST_PASS="password"
|
||||||
export ODBC_TEST_DSN="Driver={ODBC Driver 17 for SQL Server};Server=127.0.0.1;Database=odbc;uid=$ODBC_TEST_USER;pwd=$ODBC_TEST_PASS"
|
export ODBC_TEST_DSN="Driver={ODBC Driver 17 for SQL Server};Server=127.0.0.1;Database=odbc;uid=$ODBC_TEST_USER;pwd=$ODBC_TEST_PASS"
|
||||||
|
|
4
.github/workflows/nightly.yml
vendored
4
.github/workflows/nightly.yml
vendored
|
@ -158,10 +158,6 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: ubuntu:${{ (matrix.branch.ref == 'PHP-8.3' || matrix.branch.ref == 'master') && '22.04' || '20.04' }}
|
image: ubuntu:${{ (matrix.branch.ref == 'PHP-8.3' || matrix.branch.ref == 'master') && '22.04' || '20.04' }}
|
||||||
env:
|
|
||||||
MYSQL_TEST_HOST: mysql
|
|
||||||
PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test
|
|
||||||
PDO_MYSQL_TEST_HOST: mysql
|
|
||||||
services:
|
services:
|
||||||
mysql:
|
mysql:
|
||||||
image: mysql:8
|
image: mysql:8
|
||||||
|
|
8
.github/workflows/push.yml
vendored
8
.github/workflows/push.yml
vendored
|
@ -48,19 +48,19 @@ jobs:
|
||||||
services:
|
services:
|
||||||
mysql:
|
mysql:
|
||||||
image: mysql:8
|
image: mysql:8
|
||||||
|
ports:
|
||||||
|
- 3306:3306
|
||||||
env:
|
env:
|
||||||
MYSQL_DATABASE: test
|
MYSQL_DATABASE: test
|
||||||
MYSQL_ROOT_PASSWORD: root
|
MYSQL_ROOT_PASSWORD: root
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres
|
image: postgres
|
||||||
|
ports:
|
||||||
|
- 5432:5432
|
||||||
env:
|
env:
|
||||||
POSTGRES_USER: postgres
|
POSTGRES_USER: postgres
|
||||||
POSTGRES_PASSWORD: postgres
|
POSTGRES_PASSWORD: postgres
|
||||||
POSTGRES_DB: test
|
POSTGRES_DB: test
|
||||||
env:
|
|
||||||
MYSQL_TEST_HOST: mysql
|
|
||||||
PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test
|
|
||||||
PDO_MYSQL_TEST_HOST: mysql
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue