Skip to content

Commit a0c2f59

Browse files
jgebaljgebal
authored
Merge branch 'develop' into feature/improve_cursor_comparison
2 parents b7ac3a4 + c396d42 commit a0c2f59

File tree

180 files changed

+344
-212
lines changed

Some content is hidden

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

180 files changed

+344
-212
lines changed

‎.gitattributes‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
1-
* export-ignore
2-
^docs/* linguist-documentation
1+
.gitattributes export-ignore
2+
.gitignore export-ignore
3+
.gitmodules export-ignore
4+
.travis.yml export-ignore
5+
mkdocs.yml export-ignore
6+
.travis export-ignore
7+
sonar-project.properties export-ignore
8+
tests export-ignore
9+
development export-ignore
10+
node_modules export-ignore
11+
^docs/* linguist-documentation

‎.gitattributes.release‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ node_modules/
1515
utPLSQL_latest_release/
1616
utPLSQL-cli/
1717
development/env.sh
18+
*.log

‎.travis.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ env:
3333
- CURRENT_BRANCH=${TRAVIS_BRANCH}
3434
- UTPLSQL_REPO="utPLSQL/utPLSQL"
3535
- UTPLSQL_BUILD_NO="${TRAVIS_BUILD_NUMBER:-0}"
36-
- UTPLSQL_VERSION_PATTERN='v?([0-9X]+\.){3}[0-9X]+'
36+
- UTPLSQL_VERSION_PATTERN="v?([0-9]+\.){3}[0-9]+[^']*"
3737
- UTPLSQL_VERSION=$(. .travis/get_project_version.sh)
3838
- UTPLSQL_BUILD_VERSION=$(. .travis/get_project_build_version.sh)
3939
- UTPLSQL_SOURCES_DIR='source'
@@ -84,22 +84,22 @@ install:
8484
- bash .travis/install_sqlcl.sh
8585
- sudo mkdir -p /dev/pdbs
8686
- sudo chmod -R 777 /dev/pdbs
87-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/start_db.sh; fi
87+
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/start_db.sh; fi
8888
- df -h
8989

9090
before_script:
91-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/install.sh; fi
92-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/install_utplsql_release.sh; fi
93-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/create_additional_grants_for_old_tests.sh; fi
94-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/run_examples.sh; fi
95-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/run_old_tests.sh; fi
91+
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/install.sh; fi
92+
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/install_utplsql_release.sh; fi
93+
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/create_additional_grants_for_old_tests.sh; fi
94+
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_examples.sh; fi
95+
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_old_tests.sh; fi
9696

9797
script:
98-
- if [ "${TRAVIS_TAG}" = "" ]; then bash test/install_and_run_tests.sh; fi
99-
- if [ "${TRAVIS_TAG}" = "" ] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then sonar-scanner; fi
100-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/coveralls_uploader.sh; fi
98+
- if [[ ! $TRAVIS_TAG ]]; then bash test/install_and_run_tests.sh; fi
99+
- if [[ ! $TRAVIS_TAG ]] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then sonar-scanner; fi
100+
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/coveralls_uploader.sh; fi
101101
- bash .travis/build_docs.sh
102-
- if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/push_release_version.sh; fi
102+
- if [[ ! $TRAVIS_TAG ]]; then bash .travis/push_release_version.sh; fi
103103
- bash .travis/push_docs_to_gh_pages.sh
104104

105105
before_deploy:

‎.travis/build_release_archive.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ rm -rf docs/*
55
# and replace it with generated html documentation from the ignored site folder
66
cp -r -v site/* docs
77

8-
mv -f .gitattributes.release .gitattributes
98
git add .
109
git commit -m "tmp commit for building a release archive"
1110

‎.travis/get_project_version.sh‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
#!/usr/bin/env bash
2-
#If building a new version from a release branch - then version is taken from release branch name
2+
3+
#When building a new version from a release branch, the version is taken from release branch name
34
if [[ "${CURRENT_BRANCH}" =~ ^release/v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
45
version=${CURRENT_BRANCH#release\/}
5-
elif [[ "${TRAVIS_TAG}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
6-
version=${TRAVIS_TAG}
76
else
7+
#Otherwise, version is taken from the VERSION file
88
version=`cat VERSION`
9+
#When on develop branch, add "-develop" to the version text
10+
if [[ "${CURRENT_BRANCH}" == "develop" ]]; then
11+
version=`sed -r "s/(v?[0-9]+\.[0-9]+\.[0-9]+).*/\1-develop/" <<< "${version}"`
12+
fi
913
fi
1014
echo ${version}

‎.travis/push_release_version.sh‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
#!/usr/bin/env bash
22

3-
echo Current branch is "${CURRENT_BRANCH}"
4-
if [[ "${CURRENT_BRANCH}" =~ ^release/v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
5-
3+
# We are updating version number only when:
4+
# - not a pull request
5+
# - branch name is = develop or branch name is like release/vX.X.X...
6+
if [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [[ "${CURRENT_BRANCH}" =~ ^(release/v[0-9]+\.[0-9]+\.[0-9]+.*|develop)$ ]]; then
7+
echo Current branch is "${CURRENT_BRANCH}"
68
echo Current job number is "${TRAVIS_JOB_NUMBER}"
9+
#The publishing is done only once (for first job on a build matrix)
710
if [[ "${TRAVIS_JOB_NUMBER}" =~ \.1$ ]]; then
8-
echo Publishing will be done for a job no. "${TRAVIS_JOB_NUMBER}"
11+
echo "Committing version & buildNo into branch (${CURRENT_BRANCH})"
912
git add sonar-project.properties
1013
git add VERSION
11-
git commit -m 'Updated project version after building a release [skip ci]'
12-
13-
echo Pushing to origin
14+
git add source/*
15+
git commit -m 'Updated project version after build [skip ci]'
16+
echo "Pushing to origin"
1417
git push --quiet origin HEAD:${CURRENT_BRANCH}
1518
else
16-
echo Publishing will not be done for a job no.: "${TRAVIS_JOB_NUMBER}"
19+
echo "Publishing of version skipped for job No.: ${TRAVIS_JOB_NUMBER}"
1720
fi
1821
else
19-
echo Not on a release branch - skipping publishing of version
22+
echo "Publishing of version skipped for branch ${CURRENT_BRANCH}, pull request ${TRAVIS_PULL_REQUEST}"
2023
fi

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v3.0.4
1+
v3.0.4-develop

‎sonar-project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
sonar.projectKey=utPLSQL
33
# this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1.
44
sonar.projectName=utPLSQL
5-
sonar.projectVersion=v3.0.4
5+
sonar.projectVersion=v3.0.4-develop
66

77
# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
88
# Since SonarQube 4.2, this property is optional if sonar.modules is set.

‎source/api/ut.pkb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
create or replace package body ut is
22

33
/*
4-
utPLSQL - Version X.X.X.X
4+
utPLSQL - Version 3
55
Copyright 2016 - 2017 utPLSQL Project
66

77
Licensed under the Apache License, Version 2.0 (the "License"):

0 commit comments

Comments
 (0)