Resolve conflict in cherry-pick of 9879f3eaa5593207d93b4c978afdd592ba…

…37be37 and change the commit message
Multiwoven · Dec 19, 2024 · e3087f2 · e3087f2
1 parent 798e4f4
commit e3087f2
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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