Skip to content

Commit 4d660d6

Browse files
committed
wip
1 parent 37974f1 commit 4d660d6

File tree

5 files changed

+56
-30
lines changed

5 files changed

+56
-30
lines changed

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ runs:
1111
apk add \
1212
build-base \
1313
autoconf \
14+
unzip \
1415
bison \
1516
re2c \
1617
pkgconf \
18+
mysql-client \
1719
aspell-dev \
1820
bzip2-dev \
1921
curl-dev \
@@ -36,17 +38,34 @@ runs:
3638
readline-dev \
3739
sqlite-dev \
3840
tidyhtml-dev \
39-
tzdata
41+
krb5-dev \
42+
gdbm-dev \
43+
lmdb-dev \
44+
argon2-dev \
45+
enchant2-dev \
46+
freetds-dev \
47+
imap-dev \
48+
net-snmp-dev \
49+
openldap-dev \
50+
unixodbc-dev \
51+
postgresql14-dev \
52+
tzdata \
53+
musl-locales \
54+
musl-locales-lang
4055
else
4156
export ENV DEBIAN_FRONTEND=noninteractive
4257
apt-get -y -qq update
4358
apt-get install -y -q \
59+
build-essential \
60+
autoconf \
61+
unzip \
4462
bison \
4563
re2c \
4664
locales \
4765
ldap-utils \
4866
openssl \
4967
slapd \
68+
mysql-client \
5069
language-pack-de \
5170
libgmp-dev \
5271
libicu-dev \
@@ -57,6 +76,7 @@ runs:
5776
libsasl2-dev \
5877
libxpm-dev \
5978
libzip-dev \
79+
libbz2-dev \
6080
libsqlite3-dev \
6181
libwebp-dev \
6282
libonig-dev \

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,20 @@ runs:
6666
--with-cdb \
6767
--enable-flatfile \
6868
--enable-inifile \
69-
--with-tcadb \
69+
$(if [ -f /etc/alpine-release ]; then echo ; else echo --with-tcadb; fi) \
7070
--with-lmdb \
71-
--with-qdbm \
71+
$(if [ -f /etc/alpine-release ]; then echo --with-gdbm; else echo --with-qdbm; fi) \
7272
--with-snmp \
7373
--with-unixODBC \
74-
--with-imap \
74+
$(if [ -f /etc/alpine-release ]; then echo ; else echo --with-imap; fi) \
7575
--with-kerberos \
7676
--with-imap-ssl \
7777
--with-pdo-odbc=unixODBC,/usr \
78-
--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient \
79-
--with-oci8=shared,instantclient,/opt/oracle/instantclient \
78+
$(if [ -f /etc/alpine-release ]; then echo ; else echo --with-pdo-oci=shared,instantclient,/opt/oracle/instantclient; fi) \
79+
$(if [ -f /etc/alpine-release ]; then echo ; else echo --with-oci8=shared,instantclient,/opt/oracle/instantclient; fi) \
8080
--with-config-file-path=/etc \
8181
--with-config-file-scan-dir=/etc/php.d \
82-
--with-pdo-firebird \
82+
$(if [ -f /etc/alpine-release ]; then echo ; else echo --with-pdo-firebird; fi) \
8383
--with-pdo-dblib \
8484
--enable-werror \
8585
${{ inputs.configurationParameters }}

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

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,28 @@ runs:
66
run: |
77
set -x
88
9-
service mysql start
10-
service postgresql start
11-
service slapd start
12-
mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
13-
# Ensure local_infile tests can run.
14-
mysql -uroot -proot -e "SET GLOBAL local_infile = true"
15-
-u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
16-
-u postgres psql -c "CREATE DATABASE test;"
17-
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;"
18-
locale-gen de_DE
9+
if [ -f /etc/alpine-release ]; then
10+
echo "TODO SETUP"
11+
else
12+
service postgresql start
13+
service slapd start
14+
mysql -hmysql -urootu -prootp -e "CREATE DATABASE IF NOT EXISTS test"
15+
# Ensure local_infile tests can run.
16+
mysql -hmysql -urootu -prootp -e "SET GLOBAL local_infile = true"
17+
-u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
18+
-u postgres psql -c "CREATE DATABASE test;"
19+
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;"
20+
locale-gen de_DE
1921
20-
./.github/scripts/setup-slapd.sh
22+
./.github/scripts/setup-slapd.sh
2123
22-
cp ext/snmp/tests/snmpd.conf /etc/snmp
23-
cp ext/snmp/tests/bigtest /etc/snmp
24-
service snmpd restart
24+
cp ext/snmp/tests/snmpd.conf /etc/snmp
25+
cp ext/snmp/tests/bigtest /etc/snmp
26+
service snmpd restart
2527
26-
groupadd -g 5000 vmail
27-
useradd -m -d /var/vmail -s /bin/false -u 5000 -g vmail vmail
28-
cp ext/imap/tests/setup/dovecot.conf /etc/dovecot/dovecot.conf
29-
cp ext/imap/tests/setup/dovecotpass /etc/dovecot/dovecotpass
30-
service dovecot restart
28+
groupadd -g 5000 vmail
29+
useradd -m -d /var/vmail -s /bin/false -u 5000 -g vmail vmail
30+
cp ext/imap/tests/setup/dovecot.conf /etc/dovecot/dovecot.conf
31+
cp ext/imap/tests/setup/dovecotpass /etc/dovecot/dovecotpass
32+
service dovecot restart
33+
fi

.github/actions/test-linux/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ runs:
99
- shell: bash
1010
run: |
1111
set -x
12-
export MYSQL_TEST_USER=root
13-
export MYSQL_TEST_PASSWD=root
12+
export MYSQL_TEST_USER=useru
13+
export MYSQL_TEST_PASSWD=userp
1414
export PDO_MYSQL_TEST_DSN="mysql:host=localhost;dbname=test"
15-
export PDO_MYSQL_TEST_USER=root
16-
export PDO_MYSQL_TEST_PASS=root
15+
export PDO_MYSQL_TEST_USER=useru
16+
export PDO_MYSQL_TEST_PASS=userp
1717
export PDO_DBLIB_TEST_DSN="dblib:host=127.0.0.1;dbname=master;version=7.0"
1818
export PDO_DBLIB_TEST_USER="pdo_test"
1919
export PDO_DBLIB_TEST_PASS="password"

.github/workflows/push.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ jobs:
3737
container:
3838
image: "${{ matrix.alpine && 'alpine:3.15' || 'ubuntu:focal' }}"
3939
services:
40+
mysql:
41+
image: mysql:8
42+
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5 -e MYSQL_ROOT_PASSWORD=rootu -e MYSQL_USER=useru -e MYSQL_PASSWORD=userp -e MYSQL_DATABASE=test --entrypoint sh mysql:8 -c "exec docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password"
4043
mssql:
4144
image: mcr.microsoft.com/mssql/server:2019-latest
4245
env:

0 commit comments

Comments
 (0)