Skip to content

Commit ba07a0b

Browse files
committed
Move installation of oracle instant client in GHA
Closes GH-12033
1 parent 20ac42e commit ba07a0b

File tree

5 files changed

+20
-17
lines changed

5 files changed

+20
-17
lines changed

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

-12
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,3 @@ runs:
5959
libjpeg-dev \
6060
libpng-dev \
6161
libfreetype6-dev
62-
63-
mkdir /opt/oracle
64-
wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
65-
unzip instantclient-basiclite-linuxx64.zip && rm instantclient-basiclite-linuxx64.zip
66-
wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
67-
unzip instantclient-sdk-linuxx64.zip && rm instantclient-sdk-linuxx64.zip
68-
mv instantclient_*_* /opt/oracle/instantclient
69-
# interferes with libldap2 headers
70-
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-x32/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ runs:
66
run: |
77
set -x
88
make install
9-
mkdir /etc/php.d
9+
mkdir -p /etc/php.d
1010
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

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ runs:
66
run: |
77
set -x
88
sudo make install
9-
sudo mkdir /etc/php.d
9+
sudo mkdir -p /etc/php.d
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/setup-oracle/action.yml

+17
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,20 @@ runs:
1111
--name oracle \
1212
-h oracle \
1313
-d gvenzl/oracle-xe:slim
14+
15+
mkdir /opt/oracle
16+
wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
17+
unzip instantclient-basiclite-linuxx64.zip && rm instantclient-basiclite-linuxx64.zip
18+
wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
19+
unzip instantclient-sdk-linuxx64.zip && rm instantclient-sdk-linuxx64.zip
20+
mv instantclient_*_* /opt/oracle/instantclient
21+
# interferes with libldap2 headers
22+
rm /opt/oracle/instantclient/sdk/include/ldap.h
23+
# fix debug build warning: zend_signal: handler was replaced for signal (2) after startup
24+
echo DISABLE_INTERRUPT=on > /opt/oracle/instantclient/network/admin/sqlnet.ora
25+
sudo sh -c 'echo /opt/oracle/instantclient >/etc/ld.so.conf.d/oracle-instantclient.conf && ldconfig'
26+
27+
sudo mkdir -p /etc/php.d
28+
sudo chmod 777 /etc/php.d
29+
echo extension=oci8.so > /etc/php.d/oci8.ini
30+
echo extension=pdo_oci.so > /etc/php.d/pdo_oci.ini

.github/workflows/nightly.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ jobs:
555555
- name: make install
556556
run: |
557557
sudo make install
558-
sudo mkdir /etc/php.d
558+
sudo mkdir -p /etc/php.d
559559
sudo chmod 777 /etc/php.d
560560
echo mysqli.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/mysqli.ini
561561
echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/pdo_mysql.ini

0 commit comments

Comments
 (0)