From f3bd027b6985ce0c488bae93eae4e7acd7159ed8 Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Mon, 28 Aug 2023 12:55:39 +0200 Subject: [PATCH] Fix missing instantclient in CI We should only pass the --with-pdo-oci and --with-oci8 flags if instantclient is installed. Closes GH-12066 --- .github/actions/configure-x64/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/configure-x64/action.yml b/.github/actions/configure-x64/action.yml index ee802334490..3c3264ae07f 100644 --- a/.github/actions/configure-x64/action.yml +++ b/.github/actions/configure-x64/action.yml @@ -74,8 +74,8 @@ runs: --with-imap \ --with-imap-ssl \ --with-pdo-odbc=unixODBC,/usr \ - --with-pdo-oci=shared,instantclient,/opt/oracle/instantclient \ - --with-oci8=shared,instantclient,/opt/oracle/instantclient \ + $([ -d "/opt/oracle/instantclient" ] && echo '--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient') \ + $([ -d "/opt/oracle/instantclient" ] && echo '--with-oci8=shared,instantclient,/opt/oracle/instantclient') \ --with-config-file-path=/etc \ --with-config-file-scan-dir=/etc/php.d \ --with-pdo-firebird \