Skip to content

Commit 6c08010

Browse files
author
Jacek Gębal
committed
Update project settings
1 parent 372a567 commit 6c08010

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616

1717
env:
1818
UTPLSQL_VERSION: ${{matrix.utplsql-version}}
19+
ORACLE_DOCKER_IMAGE: gvenzl/oracle-free:23-slim-faststart
1920

2021
runs-on: ubuntu-latest
2122
strategy:
@@ -24,9 +25,10 @@ jobs:
2425

2526
services:
2627
oracle:
27-
image: gvenzl/oracle-free:21-slim
28+
image: ${{env.ORACLE_DOCKER_IMAGE}}
2829
env:
2930
ORACLE_PASSWORD: oracle
31+
SERVICE_NAME: FREEPDB1
3032
ports:
3133
- 1521:1521
3234
options: >-

scripts/0_start_db.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
docker run -d --name ora-utplsql -p 1521:1521 -e ORACLE_PASSWORD=oracle gvenzl/oracle-xe:18-slim
1+
docker run -d --name ora-utplsql -p 1521:1521 -e ORACLE_PASSWORD=${ORACLE_PASSWORD} ${ORACLE_DOCKER_IMAGE}

scripts/1_install_utplsql.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
git clone --depth=1 --branch=${UTPLSQL_VERSION} https://github.com/utPLSQL/utPLSQL.git utPLSQL
22
chmod -R go+w $(pwd)/utPLSQL/source
33
docker run --rm -v $(pwd)/utPLSQL:/utPLSQL -w /utPLSQL/source --network host \
4-
--entrypoint sqlplus gvenzl/oracle-xe:21-slim sys/oracle@//127.0.0.1:1521/XE as sysdba @install_headless.sql UT3 UT3 users
4+
--entrypoint sqlplus ${ORACLE_DOCKER_IMAGE} sys/oracle@//127.0.0.1:1521/${SERVICE_NAME} as sysdba @install_headless.sql UT3 UT3 users

scripts/2_install_demo_project.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
docker run --rm -v $(pwd):/work -w /work/ --network host \
2-
--entrypoint sqlplus gvenzl/oracle-xe:21-slim \
3-
sys/oracle@//127.0.0.1:1521/XE as sysdba @source/create_user.sql
2+
--entrypoint sqlplus ${ORACLE_DOCKER_IMAGE} \
3+
sys/oracle@//127.0.0.1:1521/${SERVICE_NAME} as sysdba @source/create_user.sql
44

55
docker run --rm -v $(pwd):/work -w /work/ --network host \
6-
--entrypoint sqlplus gvenzl/oracle-xe:21-slim \
7-
ut3_demo/ut3_demo@//127.0.0.1:1521/XE @source/install.sql
6+
--entrypoint sqlplus ${ORACLE_DOCKER_IMAGE} \
7+
ut3_demo/ut3_demo@//127.0.0.1:1521/${SERVICE_NAME} @source/install.sql

scripts/3_install_tests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
docker run --rm -v $(pwd):/work -w /work/ --network host \
2-
--entrypoint sqlplus gvenzl/oracle-xe:21-slim \
3-
ut3_demo/ut3_demo@//127.0.0.1:1521/XE @test/install.sql
2+
--entrypoint sqlplus ${ORACLE_DOCKER_IMAGE} \
3+
ut3_demo/ut3_demo@//127.0.0.1:1521/${SERVICE_NAME} @test/install.sql

scripts/4_run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -ev
44

5-
utPLSQL-cli/bin/utplsql run ut3_demo/ut3_demo@//127.0.0.1:1521/XE?oracle.net.disableOob=true \
5+
utPLSQL-cli/bin/utplsql run ut3_demo/ut3_demo@//127.0.0.1:1521/${SERVICE_NAME} \
66
-source_path=source -regex_expression="(\w+)/(\w+)/(R__)(\w+)\.(\w+)\.(\w+)$" \
77
-owner_subexpression=4 \
88
-name_subexpression=5 \

0 commit comments

Comments
 (0)