mirror of
https://github.com/php/php-src.git
synced 2024-11-27 20:03:40 +08:00
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Move installation of oracle instant client in GHA
This commit is contained in:
commit
a8e5285437
12
.github/actions/apt-x64/action.yml
vendored
12
.github/actions/apt-x64/action.yml
vendored
@ -59,15 +59,3 @@ 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
|
||||
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
.github/actions/install-linux-x32/action.yml
vendored
2
.github/actions/install-linux-x32/action.yml
vendored
@ -6,7 +6,7 @@ runs:
|
||||
run: |
|
||||
set -x
|
||||
make install
|
||||
mkdir /etc/php.d
|
||||
mkdir -p /etc/php.d
|
||||
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
|
||||
|
4
.github/actions/install-linux/action.yml
vendored
4
.github/actions/install-linux/action.yml
vendored
@ -6,9 +6,7 @@ runs:
|
||||
run: |
|
||||
set -x
|
||||
sudo make install
|
||||
sudo mkdir /etc/php.d
|
||||
sudo mkdir -p /etc/php.d
|
||||
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
|
||||
|
17
.github/actions/setup-oracle/action.yml
vendored
17
.github/actions/setup-oracle/action.yml
vendored
@ -11,3 +11,20 @@ runs:
|
||||
--name oracle \
|
||||
-h oracle \
|
||||
-d gvenzl/oracle-xe:slim
|
||||
|
||||
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
|
||||
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'
|
||||
|
||||
sudo mkdir -p /etc/php.d
|
||||
sudo chmod 777 /etc/php.d
|
||||
echo extension=oci8.so > /etc/php.d/oci8.ini
|
||||
echo extension=pdo_oci.so > /etc/php.d/pdo_oci.ini
|
||||
|
2
.github/workflows/nightly.yml
vendored
2
.github/workflows/nightly.yml
vendored
@ -564,7 +564,7 @@ jobs:
|
||||
- name: make install
|
||||
run: |
|
||||
sudo make install
|
||||
sudo mkdir /etc/php.d
|
||||
sudo mkdir -p /etc/php.d
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user