From e3087f28601ae1231cc900542a5e6b082262323e Mon Sep 17 00:00:00 2001 From: TivonB-AI2 <124182151+TivonB-AI2@users.noreply.github.com> Date: Tue, 17 Dec 2024 08:35:31 -0500 Subject: [PATCH] Resolve conflict in cherry-pick of 9879f3eaa5593207d93b4c978afdd592ba37be37 and change the commit message --- .github/workflows/integrations-ci.yml | 14 ++++++++++++++ .github/workflows/integrations-main.yml | 15 +++++++++++++++ .github/workflows/server-ci.yml | 13 ++++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integrations-ci.yml b/.github/workflows/integrations-ci.yml index 535776ad..f7c9aa9a 100644 --- a/.github/workflows/integrations-ci.yml +++ b/.github/workflows/integrations-ci.yml @@ -33,11 +33,25 @@ jobs: - name: Download and Install Oracle Instant Client run: | +<<<<<<< HEAD sudo apt-get install -y libaio1 alien wget http://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.6-basic-19.6.0.0.0-1.x86_64.rpm wget http://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.6-devel-19.6.0.0.0-1.x86_64.rpm sudo alien -i --scripts oracle-instantclient*.rpm rm -f oracle-instantclient*.rpm +======= + wget http://ftp.debian.org/debian/pool/main/liba/libaio/libaio1_0.3.113-4_amd64.deb + sudo dpkg -i libaio1_0.3.113-4_amd64.deb + sudo apt-get install -f + sudo apt-get install -y alien unixodbc-dev + wget http://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.6-basic-19.6.0.0.0-1.x86_64.rpm + wget http://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.6-devel-19.6.0.0.0-1.x86_64.rpm + sudo alien -i --scripts oracle-instantclient*.rpm + rm -f oracle-instantclient*.rpm + echo "export LD_LIBRARY_PATH=/usr/lib/oracle/19.6/client64/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV + echo "export C_INCLUDE_PATH=/usr/include/oracle/19.6/client64:$C_INCLUDE_PATH" >> $GITHUB_ENV + echo "export CPLUS_INCLUDE_PATH=/usr/include/oracle/19.6/client64:$CPLUS_INCLUDE_PATH" >> $GITHUB_ENV +>>>>>>> 9879f3ea (chore(CE): Update Oracle Instant Client Installation (#723)) - name: Install FreeTDS for TinyTDS gem run: | diff --git a/.github/workflows/integrations-main.yml b/.github/workflows/integrations-main.yml index 8e9b3a16..23d09ccc 100644 --- a/.github/workflows/integrations-main.yml +++ b/.github/workflows/integrations-main.yml @@ -41,11 +41,26 @@ jobs: - name: Download and Install Oracle Instant Client run: | +<<<<<<< HEAD sudo apt-get install -y libaio1 alien wget http://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.6-basic-19.6.0.0.0-1.x86_64.rpm wget http://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.6-devel-19.6.0.0.0-1.x86_64.rpm sudo alien -i --scripts oracle-instantclient*.rpm rm -f oracle-instantclient*.rpm +======= + wget http://ftp.debian.org/debian/pool/main/liba/libaio/libaio1_0.3.113-4_amd64.deb + sudo dpkg -i libaio1_0.3.113-4_amd64.deb + sudo apt-get install -f + sudo apt-get install -y alien unixodbc-dev + wget http://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.6-basic-19.6.0.0.0-1.x86_64.rpm + wget http://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.6-devel-19.6.0.0.0-1.x86_64.rpm + sudo alien -i --scripts oracle-instantclient*.rpm + rm -f oracle-instantclient*.rpm + echo "export LD_LIBRARY_PATH=/usr/lib/oracle/19.6/client64/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV + echo "export C_INCLUDE_PATH=/usr/include/oracle/19.6/client64:$C_INCLUDE_PATH" >> $GITHUB_ENV + echo "export CPLUS_INCLUDE_PATH=/usr/include/oracle/19.6/client64:$CPLUS_INCLUDE_PATH" >> $GITHUB_ENV + +>>>>>>> 9879f3ea (chore(CE): Update Oracle Instant Client Installation (#723)) - name: Install FreeTDS for TinyTDS gem run: | diff --git a/.github/workflows/server-ci.yml b/.github/workflows/server-ci.yml index 3a79bc4c..cc576dfb 100644 --- a/.github/workflows/server-ci.yml +++ b/.github/workflows/server-ci.yml @@ -52,12 +52,23 @@ jobs: - name: Download and Install Oracle Instant Client run: | - sudo apt-get install -y libaio1 alien + wget http://ftp.debian.org/debian/pool/main/liba/libaio/libaio1_0.3.113-4_amd64.deb + sudo dpkg -i libaio1_0.3.113-4_amd64.deb + sudo apt-get install -f + sudo apt-get install -y alien unixodbc-dev wget http://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.6-basic-19.6.0.0.0-1.x86_64.rpm wget http://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient19.6-devel-19.6.0.0.0-1.x86_64.rpm sudo alien -i --scripts oracle-instantclient*.rpm rm -f oracle-instantclient*.rpm +<<<<<<< HEAD +======= + echo "export LD_LIBRARY_PATH=/usr/lib/oracle/19.6/client64/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV + echo "export C_INCLUDE_PATH=/usr/include/oracle/19.6/client64:$C_INCLUDE_PATH" >> $GITHUB_ENV + echo "export CPLUS_INCLUDE_PATH=/usr/include/oracle/19.6/client64:$CPLUS_INCLUDE_PATH" >> $GITHUB_ENV + + +>>>>>>> 9879f3ea (chore(CE): Update Oracle Instant Client Installation (#723)) - name: Install FreeTDS for TinyTDS gem run: | sudo apt-get install libc6-dev