Skip to content

Commit 3e237ec

Browse files
authored
Remove remainings of recent oci extensions removal (#13352)
Following a4d64b2
1 parent cd66fcc commit 3e237ec

File tree

4 files changed

+1
-11
lines changed

4 files changed

+1
-11
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ runs:
2828
export PDO_DBLIB_TEST_DSN="dblib:host=127.0.0.1;dbname=master;version=7.0"
2929
export PDO_DBLIB_TEST_USER="pdo_test"
3030
export PDO_DBLIB_TEST_PASS="password"
31-
export PHP_OCI8_TEST_USER="system"
32-
export PHP_OCI8_TEST_PASS="pass"
33-
export PHP_OCI8_TEST_DB="localhost/XEPDB1"
34-
export PDO_OCI_TEST_USER="system"
35-
export PDO_OCI_TEST_PASS="pass"
36-
export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
3731
export PGSQL_TEST_CONNSTR="host=localhost dbname=test port=5432 user=postgres password=postgres"
3832
if [[ -z "$PDO_PGSQL_TEST_DSN" ]]; then
3933
export PDO_PGSQL_TEST_DSN="pgsql:host=localhost port=5432 dbname=test user=postgres password=postgres"

.github/scripts/windows/test_task.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ rem work-around for some spawned PHP processes requiring OpenSSL
123123
echo extension=php_openssl.dll >> %PHP_BUILD_DIR%\php.ini
124124

125125
rem remove ext dlls for which tests are not supported
126-
for %%i in (ldap oci8_12c pdo_oci) do (
126+
for %%i in (ldap) do (
127127
del %PHP_BUILD_DIR%\php_%%i.dll
128128
)
129129

.github/workflows/nightly.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,6 @@ jobs:
553553
ref: ${{ matrix.branch.ref }}
554554
- name: Create MSSQL container
555555
uses: ./.github/actions/setup-mssql
556-
- name: Create Oracle container
557-
uses: ./.github/actions/setup-oracle
558556
- name: apt
559557
uses: ./.github/actions/apt-x64
560558
- name: ./configure

main/build-defs.h.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
#define PHP_ODBC_LFLAGS "@ODBC_LFLAGS@"
2020
#define PHP_ODBC_LIBS "@ODBC_LIBS@"
2121
#define PHP_ODBC_TYPE "@ODBC_TYPE@"
22-
#define PHP_OCI8_DIR "@OCI8_DIR@"
23-
#define PHP_OCI8_ORACLE_VERSION "@OCI8_ORACLE_VERSION@"
2422
#define PHP_PROG_SENDMAIL "@PROG_SENDMAIL@"
2523
#define PEAR_INSTALLDIR "@EXPANDED_PEAR_INSTALLDIR@"
2624
#define PHP_INCLUDE_PATH "@INCLUDE_PATH@"

0 commit comments

Comments
 (0)