From a49bbb56b1fbd54946256a48896bc3f8bda5053e Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Wed, 7 Feb 2024 22:58:04 +0100 Subject: [PATCH] Remove remainings of recent oci extensions removal --- .github/actions/test-linux/action.yml | 6 ------ .github/scripts/windows/test_task.bat | 2 +- .github/workflows/nightly.yml | 2 -- main/build-defs.h.in | 2 -- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/actions/test-linux/action.yml b/.github/actions/test-linux/action.yml index fdcce2b188bb8..055a55ab18280 100644 --- a/.github/actions/test-linux/action.yml +++ b/.github/actions/test-linux/action.yml @@ -28,12 +28,6 @@ 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 PGSQL_TEST_CONNSTR="host=localhost dbname=test port=5432 user=postgres password=postgres" if [[ -z "$PDO_PGSQL_TEST_DSN" ]]; then export PDO_PGSQL_TEST_DSN="pgsql:host=localhost port=5432 dbname=test user=postgres password=postgres" diff --git a/.github/scripts/windows/test_task.bat b/.github/scripts/windows/test_task.bat index d7f76bfc483e0..c473d78c0d9b8 100644 --- a/.github/scripts/windows/test_task.bat +++ b/.github/scripts/windows/test_task.bat @@ -123,7 +123,7 @@ rem work-around for some spawned PHP processes requiring OpenSSL echo extension=php_openssl.dll >> %PHP_BUILD_DIR%\php.ini rem remove ext dlls for which tests are not supported -for %%i in (ldap oci8_12c pdo_oci) do ( +for %%i in (ldap) do ( del %PHP_BUILD_DIR%\php_%%i.dll ) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e35baf8224317..4f1e7ca986802 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -553,8 +553,6 @@ jobs: ref: ${{ matrix.branch.ref }} - 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 diff --git a/main/build-defs.h.in b/main/build-defs.h.in index d632b67184e06..f0cbdb631c0d5 100644 --- a/main/build-defs.h.in +++ b/main/build-defs.h.in @@ -19,8 +19,6 @@ #define PHP_ODBC_LFLAGS "@ODBC_LFLAGS@" #define PHP_ODBC_LIBS "@ODBC_LIBS@" #define PHP_ODBC_TYPE "@ODBC_TYPE@" -#define PHP_OCI8_DIR "@OCI8_DIR@" -#define PHP_OCI8_ORACLE_VERSION "@OCI8_ORACLE_VERSION@" #define PHP_PROG_SENDMAIL "@PROG_SENDMAIL@" #define PEAR_INSTALLDIR "@EXPANDED_PEAR_INSTALLDIR@" #define PHP_INCLUDE_PATH "@INCLUDE_PATH@"