From 4103196ad85e94f67797df5cf3e4306177fdfc5d Mon Sep 17 00:00:00 2001 From: "Rafael E. O'Neill" <106079170+RafaelOAiSquared@users.noreply.github.com> Date: Thu, 19 Dec 2024 14:19:55 -0400 Subject: [PATCH 1/2] chore(CE): Update Oracle Instant Client Installation #545 Co-authored-by: TivonB-AI2 <124182151+TivonB-AI2@users.noreply.github.com> --- .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 From 800b6fba482e5e63e764195e5f8df9368f2bdea1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 24 Dec 2024 11:25:19 +0530 Subject: [PATCH 2/2] chore(CE): configure database from env (#549) Co-authored-by: datafloyd --- server/config/database.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/config/database.yml b/server/config/database.yml index 0de161a4..77737fa9 100644 --- a/server/config/database.yml +++ b/server/config/database.yml @@ -8,18 +8,18 @@ development: host: <%= ENV['DB_HOST'] %> username: <%= ENV['DB_USERNAME'] %> password: <%= ENV['DB_PASSWORD'] %> - database: multiwoven_server_development + database: <%= ENV.fetch("DB_NAME") { "multiwoven_server_development" } %> test: <<: *default host: <%= ENV['DB_HOST'] %> username: <%= ENV['DB_USERNAME'] %> password: <%= ENV['DB_PASSWORD'] %> - database: multiwoven_server_test + database: <%= ENV.fetch("DB_NAME") { "multiwoven_server_test" } %> production: <<: *default host: <%= ENV['DB_HOST'] %> username: <%= ENV['DB_USERNAME'] %> password: <%= ENV['DB_PASSWORD'] %> - database: multiwoven_server_production + database: <%= ENV.fetch("DB_NAME") { "multiwoven_server_production" } %>