Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita9f9660

Browse files
authored
Merge pull request#18 from utPLSQL/fix/coverage_fix
Fix/coverage fix
2 parents552b2ea +77d2013 commita9f9660

File tree

27 files changed

+60
-43
lines changed

27 files changed

+60
-43
lines changed

‎.azure_templates/t-extend-database-build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ steps:
5454
addBaseImageData:false
5555

5656
-${{ each trg_db in parameters.targetDatabases }}:
57-
-bash:|
58-
# download Oracle Database docker image from private repo and start the DB
59-
time docker pull${{ parameters.dockerRepo }}:${{ trg_db.oracleVersion }}
60-
# start the docker container (DB)
61-
time docker run -d --name ${{ trg_db.oracleVersion }} ${{ trg_db.dockerOptions }} -p 1521:${{ trg_db.dockerPortMap }} ${{ parameters.dockerRepo }}:${{ trg_db.oracleVersion }}
62-
# Wait for DB startup
63-
time docker logs -f${{ trg_db.oracleVersion }} | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered
64-
displayName: 'Start Oracle DB Docker container: ${{ trg_db.oracleVersion }}'
65-
57+
-template:t-task-extend-create-docker-database.yml
58+
parameters:
59+
containerRegistry:${{ parameters.containerRegistry }}
60+
dockerRepo:${{ parameters.dockerRepo }}
61+
dbname:${{ trg_db.oracleVersion }}
62+
oracleVersion:${{ trg_db.oracleVersion }}
63+
dockerOptions:${{ trg_db.dockerOptions }}
64+
dockerPortMap:${{ trg_db.dockerPortMap }}
65+
6666
-${{ each script in trg_db.scripts }}:
6767
-template:t-task-extend-sqlcl.yml
6868
parameters:

‎.azure_templates/t-task-extend-create-docker-database.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ steps:
2828
${{ parameters.dockerOptions }} \
2929
-p 1521:${{ parameters.dockerPortMap }} \
3030
--network utplsql_network \
31+
-e "ORACLE_PASSWORD=oracle" \
3132
${{ parameters.dockerRepo }}:${{ parameters.oracleVersion }}
3233
# Wait for DB startup
3334
time docker logs -f ${{ parameters.dbname }} | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered

‎.azure_templates/t-task-extend-flyway.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ steps:
3131
-v ${{ parameters.config_dir }}:/flyway/conf \
3232
-v ${{ parameters.driver_dir }}:/flyway/drivers \
3333
--network utplsql_network \
34-
flyway/flyway migrate \
34+
flyway/flyway:8.5 migrate \
3535
-url=jdbc:oracle:thin:@${{ parameters.jdbcConnectionString }} \
3636
-configFiles="/flyway/conf/${{ parameters.config_file }}" \
3737
-user="${{ parameters.user }}" \

‎.azure_templates/t-task-extend-sqlcl-liquibase.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ steps:
1818
#Issue with 19.3 docker images. fixed in 21
1919
sql ${{ parameters.user }}/${{ parameters.password }}@//${{ parameters.connectionString }}?oracle.net.disableOob=true<<EOF
2020
lb version
21-
lb update -debug -changelog ${{ parameters.masterchangelogfile }}
21+
lb update -debug -changelog-file ${{ parameters.masterchangelogfile }}
2222
exit;
2323
EOF
2424
exit $?

‎.azure_templates/t-task-extend-utplsqlcli.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,15 @@ steps:
1919
cd ${{ parameters.work_dir }}
2020
utplsql run ${{ parameters.test_user }}/${{ parameters.test_pwd }}@//${{ parameters.connectionString }}?oracle.net.disableOob=true \
2121
-source_path=${{ parameters.source_path }} \
22+
-regex_expression="(\w+)/(\w+)/(R__)(\w+)\.(\w+)\.(\w+)$" \
23+
-owner_subexpression=4 \
24+
-name_subexpression=5 \
25+
-type_subexpression=6 \
2226
-test_path=${{ parameters.test_path }} \
27+
-regex_expression="(\w+)/(\w+)/(\w+)\.(\w+)\.(\w+)$" \
28+
-owner_subexpression=1 \
29+
-type_subexpression=5 \
30+
-name_subexpression=4 \
2331
-f=ut_documentation_reporter -c \
2432
-f=ut_coverage_sonar_reporter -o=coverage.xml \
2533
-f=ut_sonar_test_reporter -o=test_results.xml \

‎.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on:ubuntu-latest
2121
strategy:
2222
matrix:
23-
utplsql-version:[develop, v3.1.8, v3.1.11]
23+
utplsql-version:[develop, v3.1.13]
2424

2525
services:
2626
oracle:
@@ -45,7 +45,7 @@ jobs:
4545
run:echo Installing ${UTPLSQL_VERSION} && sh ${{ github.workspace }}/scripts/1_install_utplsql.sh
4646

4747
-name:Install utPLSQL-cli
48-
run:curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.1.8/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
48+
run:curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/3.1.9/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
4949

5050
-name:Install demo project
5151
run:sh ${{ github.workspace }}/scripts/2_install_demo_project.sh

‎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:18-slim sys/oracle@//127.0.0.1:1521/XE as sysdba @install_headless.sql UT3 UT3 users
4+
--entrypoint sqlplus gvenzl/oracle-xe:21-slim sys/oracle@//127.0.0.1:1521/XE as sysdba @install_headless.sql UT3 UT3 users

‎scripts/2_install_demo_project.sh

Lines changed: 2 additions & 2 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:18-slim \
2+
--entrypoint sqlplus gvenzl/oracle-xe:21-slim \
33
sys/oracle@//127.0.0.1:1521/XE as sysdba @source/create_user.sql
44

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

‎scripts/3_install_tests.sh

Lines changed: 1 addition & 1 deletion
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:18-slim \
2+
--entrypoint sqlplus gvenzl/oracle-xe:21-slim \
33
ut3_demo/ut3_demo@//127.0.0.1:1521/XE @test/install.sql

‎scripts/4_run_tests.sh

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,18 @@
22

33
set -ev
44

5-
utPLSQL-cli/bin/utplsql run ut3_demo/ut3_demo@//127.0.0.1:1521/XE \
6-
-source_path=source -test_path=test \
5+
utPLSQL-cli/bin/utplsql run ut3_demo/ut3_demo@//127.0.0.1:1521/XE?oracle.net.disableOob=true \
6+
-source_path=source -regex_expression="(\w+)/(\w+)/(R__)(\w+)\.(\w+)\.(\w+)$" \
7+
-owner_subexpression=4 \
8+
-name_subexpression=5 \
9+
-type_subexpression=6 \
10+
-test_path=test -regex_expression="(\w+)/(\w+)/(\w+)\.(\w+)\.(\w+)$" \
11+
-owner_subexpression=1 \
12+
-type_subexpression=5 \
13+
-name_subexpression=4 \
714
-f=ut_documentation_reporter -c \
8-
-f=ut_coverage_sonar_reporter -o=coverage.xml \
9-
-f=ut_sonar_test_reporter -o=test_results.xml \
10-
--failure-exit-code=0
11-
15+
-f=ut_coverage_sonar_reporter -o=coverage.xml \
16+
-f=ut_sonar_test_reporter -o=test_results.xml \
17+
-f=ut_coverage_cobertura_reporter -o=cobertura.xml \
18+
-f=ut_junit_reporter -o=junit_test_results.xml \
19+
--failure-exit-code=0

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp