From f335e2a8a45097033e5a394621af81e7b86ac6e0 Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Thu, 28 Sep 2023 18:06:22 +0900 Subject: [PATCH 1/2] Use `gvenzl/oracle-free:latest` --- .github/workflows/test.yml | 24 +++++++++++++----------- ci/network/admin/tnsnames.ora | 4 ++-- ci/setup_accounts.sh | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0c1b393d..3a7bfc57 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,18 +24,18 @@ jobs: truffleruby-head ] env: - ORACLE_HOME: /usr/lib/oracle/21/client64 - LD_LIBRARY_PATH: /usr/lib/oracle/21/client64/lib + ORACLE_HOME: /opt/oracle/instantclient_23_3 + LD_LIBRARY_PATH: /opt/oracle/instantclient_23_3 NLS_LANG: AMERICAN_AMERICA.AL32UTF8 TNS_ADMIN: ./ci/network/admin - DATABASE_NAME: XEPDB1 + DATABASE_NAME: FREEPDB1 TZ: Europe/Riga DATABASE_SYS_PASSWORD: Oracle18 - DATABASE_VERSION: 21.3.0.0 + DATABASE_VERSION: 23.3.0.0 services: oracle: - image: gvenzl/oracle-xe:latest + image: gvenzl/oracle-free:latest ports: - 1521:1521 env: @@ -58,14 +58,16 @@ jobs: sudo apt-get install alien - name: Download Oracle client run: | - wget -q https://download.oracle.com/otn_software/linux/instantclient/2110000/oracle-instantclient-basic-21.10.0.0.0-1.x86_64.rpm - wget -q https://download.oracle.com/otn_software/linux/instantclient/2110000/oracle-instantclient-sqlplus-21.10.0.0.0-1.x86_64.rpm - wget -q https://download.oracle.com/otn_software/linux/instantclient/2110000/oracle-instantclient-devel-21.10.0.0.0-1.x86_64.rpm + wget -q https://download.oracle.com/otn_software/linux/instantclient/23c/instantclient-basic-linux.x64-23.3.0.0.0.zip + wget -q https://download.oracle.com/otn_software/linux/instantclient/23c/instantclient-sdk-linux.x64-23.3.0.0.0.zip + wget -q https://download.oracle.com/otn_software/linux/instantclient/23c/instantclient-sqlplus-linux.x64-23.3.0.0.0.zip - name: Install Oracle client run: | - sudo alien -i oracle-instantclient-basic-21.10.0.0.0-1.x86_64.rpm - sudo alien -i oracle-instantclient-sqlplus-21.10.0.0.0-1.x86_64.rpm - sudo alien -i oracle-instantclient-devel-21.10.0.0.0-1.x86_64.rpm + sudo mkdir -p /opt/oracle/ + sudo unzip instantclient-basic-linux.x64-23.3.0.0.0.zip -d /opt/oracle/ + sudo unzip -o instantclient-sdk-linux.x64-23.3.0.0.0.zip -d /opt/oracle/ + sudo unzip -o instantclient-sqlplus-linux.x64-23.3.0.0.0.zip -d /opt/oracle/ + echo "/opt/oracle/instantclient_23_3" >> $GITHUB_PATH - name: Install JDBC Driver run: | wget -q https://download.oracle.com/otn-pub/otn_software/jdbc/211/ojdbc11.jar -O ./lib/ojdbc11.jar diff --git a/ci/network/admin/tnsnames.ora b/ci/network/admin/tnsnames.ora index 91cd300e..f8184d88 100644 --- a/ci/network/admin/tnsnames.ora +++ b/ci/network/admin/tnsnames.ora @@ -1,7 +1,7 @@ -XEPDB1 = +FREEPDB1 = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 127.0.0.1)(PORT = 1521)) (CONNECT_DATA = - (SERVICE_NAME = XEPDB1) + (SERVICE_NAME = FREEPDB1) ) ) diff --git a/ci/setup_accounts.sh b/ci/setup_accounts.sh index 9af72166..17f03159 100755 --- a/ci/setup_accounts.sh +++ b/ci/setup_accounts.sh @@ -2,7 +2,7 @@ set -ev -${ORACLE_HOME}/bin/sqlplus system/${DATABASE_SYS_PASSWORD}@${DATABASE_NAME} < Date: Thu, 28 Sep 2023 18:12:02 +0900 Subject: [PATCH 2/2] Bump `DATABASE_VERSION: 23.3.0.23` --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3a7bfc57..5ef26e88 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,7 +31,7 @@ jobs: DATABASE_NAME: FREEPDB1 TZ: Europe/Riga DATABASE_SYS_PASSWORD: Oracle18 - DATABASE_VERSION: 23.3.0.0 + DATABASE_VERSION: 23.3.0.23 services: oracle: