Skip to content

Commit 33c6aa9

Browse files
jgebaljgebal
committed
Merge branch 'develop' into feature/add_debug_reporter
# Conflicts: # source/install.sql
2 parents 6373a6a + 1dbbb85 commit 33c6aa9

76 files changed

Lines changed: 4372 additions & 2000 deletions

File tree

Some content is hidden

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

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ env:
3838
- CACHE_DIR=$HOME/.cache
3939
# Database Env
4040
- SQLCLI="$HOME/sqlcl/bin/sql"
41+
- OJDBC_HOME="$HOME/sqlcl/lib"
4142
- ORACLE_PWD="oracle"
4243
- UT3_DOCKER_REPO="utplsqlv3/oracledb"
4344
- DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}"
@@ -94,7 +95,7 @@ before_script:
9495
script:
9596
- if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi
9697
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/validate_report_files.sh; fi
97-
- if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "${TRAVIS_PULL_REQUEST_SLUG}" = "${TRAVIS_REPO_SLUG}" ]; then bash .travis/run_sonar_scanner.sh; fi
98+
- if [[ ! $TRAVIS_TAG ]] && [[ ("${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" && "${TRAVIS_PULL_REQUEST}" == false) || ("${TRAVIS_PULL_REQUEST_SLUG}" = "${UTPLSQL_REPO}") ]]; then bash .travis/run_sonar_scanner.sh; fi
9899
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi
99100

100101
notifications:

‎.travis/run_sonar_scanner.sh‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ PR_KEY_PROPERTY="sonar.pullrequest.key"
1212
PR_SONAR_BASE_PROPERTY="sonar.pullrequest.base"
1313
PR_SONAR_TOKEN_PROPERTY="sonar.pullrequest.github.token.secured"
1414

15+
DB_URL_SONAR_PROPERTY="sonar.plsql.jdbc.url"
16+
DB_DRIVER_PATH="sonar.plsql.jdbc.driver.path"
17+
1518
#Add property to file
1619
function add_sonar_property {
1720
echo "$1=$2" >> sonar-project.properties
@@ -52,5 +55,14 @@ else
5255
echo "No need to update sonar we building on release or develop"
5356
fi
5457

58+
#Address issue : Could not find ref 'develop' in refs/heads or refs/remotes/origin
59+
git fetch --no-tags https://github.com/utPLSQL/utPLSQL.git +refs/heads/develop:refs/remotes/origin/develop
60+
61+
echo "Adding OJDBC Driver Path ${OJDBC_HOME}/ojdbc8.jar"
62+
add_sonar_property "${DB_URL_SONAR_PROPERTY}" "jdbc:oracle:thin:@${CONNECTION_STR}"
63+
add_sonar_property "${DB_DRIVER_PATH}" "${OJDBC_HOME}/ojdbc8.jar"
64+
65+
5566
#Execute Sonar scanner
56-
sonar-scanner
67+
echo "Executing sonar scanner"
68+
sonar-scanner

‎docs/about/authors.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
| ---------------- | --------------
88
| David Pyke | [Shoelace](https://github.com/Shoelace)
99
| Jacek Gebal | [jgebal](https://github.com/jgebal)
10+
| Lukasz Wasylow | [lwasylow](https://github.com/lwasylow/)
1011
| Pavel Kaplya | [Pazus](https://github.com/Pazus)
1112
| Robert Love | [rlove](https://github.com/rlove)
12-
| Vinicius Avellar | [viniciusam](https://github.com/viniciusam/)
1313
| Samuel Nitsche | [pesse](https://github.com/pesse/)
14-
| Lukasz Wasylow | [lwasylow](https://github.com/lwasylow/)
14+
| Vinicius Avellar | [viniciusam](https://github.com/viniciusam/)
1515

1616

1717

‎docs/images/venn21.gif‎

3.14 KB
Loading

‎docs/images/venn22.gif‎

3.4 KB
Loading

‎docs/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The framework follows industry standards and best patterns of modern Unit Testin
1111
- [Advanced data comparison](userguide/advanced_data_comparison.md)
1212
- [Running unit tests](userguide/running-unit-tests.md)
1313
- [Querying for test suites](userguide/querying_suites.md)
14-
- [Testing best pracitces](userguide/best-practices.md)
14+
- [Testing best practices](userguide/best-practices.md)
1515
- [Upgrade utPLSQL](userguide/upgrade.md)
1616
- Reporting
1717
- [Using reporters](userguide/reporters.md)

0 commit comments

Comments
 (0)