8000 Merge pull request #1182 from utPLSQL/feature/test_parallel_sonar_ana… · utPLSQL/utPLSQL@d81824a · GitHub
[go: up one dir, main page]
Skip to content

Commit d81824a

Browse files
jgebaljgebal
authored
Merge pull request #1182 from utPLSQL/feature/test_parallel_sonar_analysis
Improvements in project build coverage reporting.
2 parents b0a2aab + 1448ef1 commit d81824a

File tree

2 files changed

+29
-2
lines changed

2 files changed

+29
-2
lines changed

‎.github/workflows/build.yml

Lines changed: 27 additions & 0 deletions
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'
@@ -129,12 +137,31 @@ 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
uses: SonarSource/sonarcloud-github-action@master
135157
env:
136158
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
137159
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
160+
with:
161+
args: >
162+
-Dsonar.buildString=${{ format( '{0}.{1}', env.UTPLSQL_BUILD_VERSION, matrix.id ) }}
163+
-Dsonar.plsql.jdbc.url=${{ format( 'jdbc:oracle:thin:@//oracle:1521/{0}', env.ORACLE_SID ) }}
164+
-Dsonar.plsql.jdbc.driver.path=${{ format( '{0}/ojdbc8.jar', env.OJDBC_HOME ) }}
138165
139166
publish:
140167
name: Deploy documentation

‎sonar-project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ sonar.pullrequest.github.endpoint=https://api.github.com/
2929
sonar.pullrequest.github.repository=utPLSQL/utPLSQL
3030

3131
sonar.plsql.jdbc.driver.class=oracle.jdbc.OracleDriver
32-
sonar.plsql.jdbc.user=UT3
32+
sonar.plsql.jdbc.user=UT3_DEVELOP
3333
sonar.plsql.jdbc.password=ut3
34-
sonar.plsql.defaultSchema=UT3
34+
sonar.plsql.defaultSchema=UT3_DEVELOP
3535

3636

3737
# Encoding of the source code. Default is default system encoding

0 commit comments

Comments
 (0)
0