Skip to content

Commit e44830b

Browse files
lwasylowlwasylow
committed
Merge branch 'feature/1114_support_native_json_21c' of https://github.com/utPLSQL/utPLSQL into feature/1114_support_native_json_21c
2 parents cbe03e8 + a08545c commit e44830b

File tree

86 files changed

+2093
-297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+2093
-297
lines changed

‎.github/workflows/build.yml‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
env:
2121
ORACLE_VERSION: ${{matrix.oracle-version}}
22+
ORACLE_SID: ${{matrix.oracle-sid}}
2223
CONNECTION_STR: ${{matrix.connection-str}}
2324
ORACLE_PASSWORD: oracle
2425
DOCKER_VOLUME: ${{matrix.docker-volume}}
@@ -27,31 +28,38 @@ jobs:
2728
matrix:
2829
include:
2930
- oracle-version: "gvenzl/oracle-xe:11-full"
31+
oracle-sid: 'XE'
3032
connection-str: '127.0.0.1:1521/XE'
3133
id: 1
3234
db_version_name: '11xe'
3335
# TODO - need to add healthcheck.sh into our containers
3436
# - oracle-version: "utplsqlv3/oracledb:12c-r1-se2-small"
37+
# oracle-sid: 'ORCLCDB'
3538
# connection-str: '127.0.0.1:1521/ORCLCDB'
3639
# id: 2
3740
# db_version_name: '12.1se'
3841
# - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small"
42+
# oracle-sid: 'ORCLCDB'
3943
# connection-str: '127.0.0.1:1521/ORCLCDB'
4044
# id: 3
4145
# db_version_name: '12.2se'
4246
- oracle-version: "gvenzl/oracle-xe:18-slim"
47+
oracle-sid: 'XE'
4348
connection-str: '127.0.0.1:1521/XE'
4449
id: 4
4550
db_version_name: '18xe'
4651
# - oracle-version: "utplsqlv3/oracledb:18c-se2-small"
52+
# oracle-sid: 'ORCLCDB'
4753
# connection-str: '127.0.0.1:1521/ORCLCDB'
4854
# id: 5
4955
# db_version_name: '18se'
5056
# - oracle-version: "utplsqlv3/oracledb:19c-se2-small"
57+
# oracle-sid: 'ORCLCDB'
5158
# connection-str: '127.0.0.1:1521/ORCLCDB'
5259
# id: 6
5360
# db_version_name: '19se'
5461
- oracle-version: "gvenzl/oracle-xe:21-slim"
62+
oracle-sid: 'XE'
5563
connection-str: '127.0.0.1:1521/XE'
5664
id: 7
5765
db_version_name: '21xe'
@@ -92,7 +100,7 @@ jobs:
92100

93101
- name: Download utPLSQL release for testing
94102
# For PR build - test using target branch as framework, for branch build use self as testing framework
95-
run: git clone --depth=1 --branch=${CI_HEAD_REF:-$CI_REF_NAME} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR
103+
run: git clone --depth=1 --branch=${CI_BASE_REF:-$CI_REF_NAME} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR
96104

97105
- name: Update privileges on sources
98106
run: chmod -R go+w ./{source,test,examples,${UTPLSQL_DIR}/source}
@@ -129,13 +137,32 @@ jobs:
129137
id: validate-reports-format
130138
run: bash .github/scripts/validate_report_files.sh
131139

140+
- name: Codecov
141+
uses: codecov/codecov-action@v2
142+
with:
143+
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
144+
files: ./cobertura.xml
145+
flags: ${{matrix.db_version_name}}
146+
fail_ci_if_error: true # optional (default = false)
147+
148+
- name: Publish unit test results
149+
uses: EnricoMi/publish-unit-test-result-action@v1.24
150+
if: always()
151+
with:
152+
files: junit_test_results.xml
153+
132154
- name: SonarCloud Scan
133155
id: sonar
134156
if: ${{ matrix.db_version_name == '21xe' }}
135157
uses: SonarSource/sonarcloud-github-action@master
136158
env:
137159
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
138160
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
161+
with:
162+
args: >
163+
-Dsonar.buildString=${{ format( '{0}.{1}', env.UTPLSQL_BUILD_VERSION, matrix.id ) }}
164+
-Dsonar.plsql.jdbc.url=${{ format( 'jdbc:oracle:thin:@//oracle:1521/{0}', env.ORACLE_SID ) }}
165+
-Dsonar.plsql.jdbc.driver.path=${{ format( '{0}/ojdbc8.jar', env.OJDBC_HOME ) }}
139166
140167
publish:
141168
name: Deploy documentation

‎docs/about/authors.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg)
22

33
### utPLSQL v3 Major Contributors
44

‎docs/about/license.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg)
22

33
# Version Information
44

‎docs/about/project-details.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg)
22

33
# utPLSQL Project Details
44

‎docs/about/support.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg)
22

33
# How to get support
44

‎docs/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg)
22

33
# Introduction to utPLSQL
44

‎docs/userguide/advanced_data_comparison.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg)
22

33
# Advanced data comparison
44

‎docs/userguide/annotations.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg)
22

33
# Annotations
44

‎docs/userguide/best-practices.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg)
22

33
# Best Practices
44

‎docs/userguide/coverage.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![version](https://img.shields.io/badge/version-v3.1.12.3731--develop-blue.svg)
1+
![version](https://img.shields.io/badge/version-v3.1.12.3742--develop-blue.svg)
22

33
# Coverage
44
utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses DBMS_PROFILER package provided with Oracle database.

0 commit comments

Comments
 (0)