Skip to content

Commit 051c886

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Fix MySQL and MSSQL CI failures
2 parents f44250c + af721c9 commit 051c886

File tree

3 files changed

+27
-10
lines changed

3 files changed

+27
-10
lines changed

.github/actions/setup-mssql/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ runs:
1111
-p 1433:1433 \
1212
--name sql1 \
1313
-h sql1 \
14-
-d mcr.microsoft.com/mssql/server:2019-CU8-ubuntu-16.04
14+
-d mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04

.github/actions/setup-x64/action.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,12 @@ runs:
66
run: |
77
set -x
88
9-
sudo service mysql start
109
sudo service slapd start
11-
mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
12-
# Ensure local_infile tests can run.
13-
mysql -uroot -proot -e "SET GLOBAL local_infile = true"
14-
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;"
15-
docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "create login odbc_test with password='password', check_policy=off; create user odbc_test for login odbc_test; grant alter, control, delete to odbc_test;"
16-
docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "ALTER SERVER ROLE sysadmin ADD MEMBER odbc_test;"
17-
docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "CREATE DATABASE odbc;"
18-
docker exec sql1 /opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U SA -P "<YourStrong@Passw0rd>" -Q "CREATE DATABASE pdo_odbc;"
10+
docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -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;"
11+
docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "create login odbc_test with password='password', check_policy=off; create user odbc_test for login odbc_test; grant alter, control, delete to odbc_test;"
12+
docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "ALTER SERVER ROLE sysadmin ADD MEMBER odbc_test;"
13+
docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "CREATE DATABASE odbc;"
14+
docker exec sql1 /opt/mssql-tools18/bin/sqlcmd -S 127.0.0.1 -U SA -C -P "<YourStrong@Passw0rd>" -Q "CREATE DATABASE pdo_odbc;"
1915
sudo locale-gen de_DE
2016
2117
./.github/scripts/setup-slapd.sh

.github/workflows/nightly.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,13 @@ jobs:
103103
needs: GENERATE_MATRIX
104104
if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
105105
services:
106+
mysql:
107+
image: mysql:8.3
108+
ports:
109+
- 3306:3306
110+
env:
111+
MYSQL_DATABASE: test
112+
MYSQL_ROOT_PASSWORD: root
106113
postgres:
107114
image: postgres
108115
env:
@@ -341,6 +348,13 @@ jobs:
341348
COVERAGE_DEBUG_NTS:
342349
if: github.repository == 'php/php-src' || github.event_name == 'workflow_dispatch'
343350
services:
351+
mysql:
352+
image: mysql:8.3
353+
ports:
354+
- 3306:3306
355+
env:
356+
MYSQL_DATABASE: test
357+
MYSQL_ROOT_PASSWORD: root
344358
postgres:
345359
image: postgres
346360
env:
@@ -587,6 +601,13 @@ jobs:
587601
needs: GENERATE_MATRIX
588602
if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
589603
services:
604+
mysql:
605+
image: mysql:8.3
606+
ports:
607+
- 3306:3306
608+
env:
609+
MYSQL_DATABASE: test
610+
MYSQL_ROOT_PASSWORD: root
590611
postgres:
591612
image: postgres
592613
env:

0 commit comments

Comments
 (0)