Skip to content

Commit c19116f

Browse files
mvorisekkocsismate
authored andcommitted
Test oci8 & pdo_oci in CI
Closes GH-8348
1 parent fd74ee7 commit c19116f

File tree

8 files changed

+37
-7
lines changed

8 files changed

+37
-7
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ runs:
55
- shell: bash
66
run: |
77
set -x
8+
89
sudo apt-get update
910
sudo apt-get install \
1011
bison \
@@ -58,11 +59,15 @@ runs:
5859
libjpeg-dev \
5960
libpng-dev \
6061
libfreetype6-dev
62+
6163
mkdir /opt/oracle
6264
wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
6365
unzip instantclient-basiclite-linuxx64.zip && rm instantclient-basiclite-linuxx64.zip
6466
wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
6567
unzip instantclient-sdk-linuxx64.zip && rm instantclient-sdk-linuxx64.zip
6668
mv instantclient_*_* /opt/oracle/instantclient
67-
# Interferes with libldap2 headers.
69+
# interferes with libldap2 headers
6870
rm /opt/oracle/instantclient/sdk/include/ldap.h
71+
# fix debug build warning: zend_signal: handler was replaced for signal (2) after startup
72+
echo DISABLE_INTERRUPT=on > /opt/oracle/instantclient/network/admin/sqlnet.ora
73+
sudo sh -c 'echo /opt/oracle/instantclient >/etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig'

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ runs:
1010
sudo chmod 777 /etc/php.d
1111
echo mysqli.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/mysqli.ini
1212
echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/pdo_mysql.ini
13+
echo extension=oci8.so > /etc/php.d/oci8.ini
14+
echo extension=pdo_oci.so > /etc/php.d/pdo_oci.ini

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Create mssql container
1+
name: Create MSSQL container
22
runs:
33
using: composite
44
steps:
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Create Oracle container
2+
runs:
3+
using: composite
4+
steps:
5+
- shell: bash
6+
run: |
7+
set -x
8+
docker run \
9+
-e "ORACLE_PASSWORD=pass" \
10+
-p 1521:1521 \
11+
--name oracle \
12+
-h oracle \
13+
-d gvenzl/oracle-xe:slim

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ runs:
1717
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;"
1818
sudo locale-gen de_DE
1919
20-
./.github/scripts/setup-slapd.sh
20+
./.github/scripts/setup-slapd.sh &>/dev/null
2121
2222
sudo cp ext/snmp/tests/snmpd.conf /etc/snmp
2323
sudo cp ext/snmp/tests/bigtest /etc/snmp

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ runs:
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"
20+
export PHP_OCI8_TEST_USER="system"
21+
export PHP_OCI8_TEST_PASS="pass"
22+
export PHP_OCI8_TEST_DB="localhost/XEPDB1"
23+
export PDO_OCI_TEST_USER="system"
24+
export PDO_OCI_TEST_PASS="pass"
25+
export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
2026
export SKIP_IO_CAPTURE_TESTS=1
2127
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
2228
-j$(/usr/bin/nproc) \

.github/workflows/nightly.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ jobs:
4747
uses: actions/checkout@v2
4848
with:
4949
ref: ${{ matrix.branch.ref }}
50-
- name: Create mssql container
51-
uses: ./.github/actions/mssql
50+
- name: Create MSSQL container
51+
uses: ./.github/actions/setup-mssql
52+
- name: Create Oracle container
53+
uses: ./.github/actions/setup-oracle
5254
- name: apt
5355
uses: ./.github/actions/apt-x64
5456
- name: ./configure

.github/workflows/push.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ jobs:
3232
steps:
3333
- name: git checkout
3434
uses: actions/checkout@v2
35-
- name: Create mssql container
36-
uses: ./.github/actions/mssql
35+
- name: Create MSSQL container
36+
uses: ./.github/actions/setup-mssql
37+
- name: Create Oracle container
38+
uses: ./.github/actions/setup-oracle
3739
- name: apt
3840
uses: ./.github/actions/apt-x64
3941
- name: ./configure

0 commit comments

Comments
 (0)