From 560a5851178edd8ea9f454ecf84c6119ba80ca80 Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Wed, 30 Oct 2024 11:34:22 +0100
Subject: [PATCH] [CI] Backport usage of db service for 8.1

Nightly already uses them. We're running into port clashes otherwise.

Closes GH-16647
---
 .github/actions/setup-x64/action.yml  |  7 -------
 .github/actions/test-linux/action.yml |  4 ++++
 .github/workflows/push.yml            | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.github/actions/setup-x64/action.yml b/.github/actions/setup-x64/action.yml
index 6cec51d4c80..d03a51f455b 100644
--- a/.github/actions/setup-x64/action.yml
+++ b/.github/actions/setup-x64/action.yml
@@ -6,14 +6,7 @@ runs:
       run: |
         set -x
 
-        sudo service mysql start
-        sudo service postgresql start
         sudo service slapd start
-        mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
-        # Ensure local_infile tests can run.
-        mysql -uroot -proot -e "SET GLOBAL local_infile = true"
-        sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
-        sudo -u postgres psql -c "CREATE DATABASE test;"
         docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login pdo_test with password='password', check_policy=off; create user pdo_test for login pdo_test; grant alter, control to pdo_test;"
         sudo locale-gen de_DE
 
diff --git a/.github/actions/test-linux/action.yml b/.github/actions/test-linux/action.yml
index 1dfba394787..b5d74cefc48 100644
--- a/.github/actions/test-linux/action.yml
+++ b/.github/actions/test-linux/action.yml
@@ -28,6 +28,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=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 SKIP_IO_CAPTURE_TESTS=1
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
           -d opcache.jit=${{ inputs.jitType }} \
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 8bce17224eb..b1f84e40224 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -43,6 +43,22 @@ env:
 jobs:
   LINUX_X64:
     if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
+    services:
+      mysql:
+        image: mysql:8.3
+        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
     strategy:
       fail-fast: false
       matrix: