Skip to content

Commit

Permalink
Test oci8 & pdo_oci in CI
Browse files Browse the repository at this point in the history
Closes GH-8348
  • Loading branch information
mvorisek authored and kocsismate committed Aug 24, 2022
1 parent fd74ee7 commit c19116f
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 7 deletions.
7 changes: 6 additions & 1 deletion .github/actions/apt-x64/action.yml
Expand Up @@ -5,6 +5,7 @@ runs:
- shell: bash
run: |
set -x
sudo apt-get update
sudo apt-get install \
bison \
Expand Down Expand Up @@ -58,11 +59,15 @@ runs:
libjpeg-dev \
libpng-dev \
libfreetype6-dev
mkdir /opt/oracle
wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
unzip instantclient-basiclite-linuxx64.zip && rm instantclient-basiclite-linuxx64.zip
wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
unzip instantclient-sdk-linuxx64.zip && rm instantclient-sdk-linuxx64.zip
mv instantclient_*_* /opt/oracle/instantclient
# Interferes with libldap2 headers.
# interferes with libldap2 headers
rm /opt/oracle/instantclient/sdk/include/ldap.h
# fix debug build warning: zend_signal: handler was replaced for signal (2) after startup
echo DISABLE_INTERRUPT=on > /opt/oracle/instantclient/network/admin/sqlnet.ora
sudo sh -c 'echo /opt/oracle/instantclient >/etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig'
2 changes: 2 additions & 0 deletions .github/actions/install-linux/action.yml
Expand Up @@ -10,3 +10,5 @@ runs:
sudo chmod 777 /etc/php.d
echo mysqli.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/mysqli.ini
echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/pdo_mysql.ini
echo extension=oci8.so > /etc/php.d/oci8.ini
echo extension=pdo_oci.so > /etc/php.d/pdo_oci.ini
@@ -1,4 +1,4 @@
name: Create mssql container
name: Create MSSQL container
runs:
using: composite
steps:
Expand Down
13 changes: 13 additions & 0 deletions .github/actions/setup-oracle/action.yml
@@ -0,0 +1,13 @@
name: Create Oracle container
runs:
using: composite
steps:
- shell: bash
run: |
set -x
docker run \
-e "ORACLE_PASSWORD=pass" \
-p 1521:1521 \
--name oracle \
-h oracle \
-d gvenzl/oracle-xe:slim
2 changes: 1 addition & 1 deletion .github/actions/setup-x64/action.yml
Expand Up @@ -17,7 +17,7 @@ runs:
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
./.github/scripts/setup-slapd.sh
./.github/scripts/setup-slapd.sh &>/dev/null
sudo cp ext/snmp/tests/snmpd.conf /etc/snmp
sudo cp ext/snmp/tests/bigtest /etc/snmp
Expand Down
6 changes: 6 additions & 0 deletions .github/actions/test-linux/action.yml
Expand Up @@ -17,6 +17,12 @@ runs:
export PDO_DBLIB_TEST_DSN="dblib:host=127.0.0.1;dbname=master;version=7.0"
export PDO_DBLIB_TEST_USER="pdo_test"
export PDO_DBLIB_TEST_PASS="password"
export PHP_OCI8_TEST_USER="system"
export PHP_OCI8_TEST_PASS="pass"
export PHP_OCI8_TEST_DB="localhost/XEPDB1"
export PDO_OCI_TEST_USER="system"
export PDO_OCI_TEST_PASS="pass"
export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
export SKIP_IO_CAPTURE_TESTS=1
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
-j$(/usr/bin/nproc) \
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/nightly.yml
Expand Up @@ -47,8 +47,10 @@ jobs:
uses: actions/checkout@v2
with:
ref: ${{ matrix.branch.ref }}
- name: Create mssql container
uses: ./.github/actions/mssql
- name: Create MSSQL container
uses: ./.github/actions/setup-mssql
- name: Create Oracle container
uses: ./.github/actions/setup-oracle
- name: apt
uses: ./.github/actions/apt-x64
- name: ./configure
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/push.yml
Expand Up @@ -32,8 +32,10 @@ jobs:
steps:
- name: git checkout
uses: actions/checkout@v2
- name: Create mssql container
uses: ./.github/actions/mssql
- name: Create MSSQL container
uses: ./.github/actions/setup-mssql
- name: Create Oracle container
uses: ./.github/actions/setup-oracle
- name: apt
uses: ./.github/actions/apt-x64
- name: ./configure
Expand Down

1 comment on commit c19116f

@iluuu1994
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this broke the nightly ASAN builds. It started on the 25th, which was the only commit on that day on the PHP-8.0 branch.

Please sign in to comment.