diff --git a/.github/actions/test-linux/action.yml b/.github/actions/test-linux/action.yml index a1a0ab33cf895..00600554a635f 100644 --- a/.github/actions/test-linux/action.yml +++ b/.github/actions/test-linux/action.yml @@ -31,8 +31,10 @@ runs: export PDO_OCI_TEST_USER="system" export PDO_OCI_TEST_PASS="pass" 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 PDO_PGSQL_TEST_DSN="host=postgres dbname=test port=5432 user=postgres password=postgres" + export PGSQL_TEST_CONNSTR="host=localhost 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_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" diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2d9762a5bc2f7..8da5e66f0205d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -48,19 +48,22 @@ jobs: services: mysql: image: mysql:8 + ports: + - 3306:3306 env: MYSQL_DATABASE: test MYSQL_ROOT_PASSWORD: root postgres: image: postgres + ports: + - 5432:5432 env: POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres POSTGRES_DB: test env: - MYSQL_TEST_HOST: mysql - PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test - PDO_MYSQL_TEST_HOST: mysql + MYSQL_TEST_HOST: localhost + PDO_MYSQL_TEST_HOST: localhost strategy: fail-fast: false matrix: diff --git a/ext/mysqli/tests/gh8978.phpt b/ext/mysqli/tests/gh8978.phpt index 92de63b381ca8..a39834f187c1f 100644 --- a/ext/mysqli/tests/gh8978.phpt +++ b/ext/mysqli/tests/gh8978.phpt @@ -24,6 +24,6 @@ try { echo 'done!'; ?> --EXPECTF-- -Warning: failed loading cafile stream: `x509.ca' in %s +Warning: mysqli_real_connect(): This stream does not support SSL/crypto in %s Cannot connect to MySQL using SSL done!