Merge branch 'develop' into feature/parameters_for_before_after_annotations

jgebal · jgebal · commit 2825cbf6ed2b · 2018-07-09T00:11:31.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -64,12 +64,8 @@ cache:
     - $MAVEN_CFG
 
 before_install:
-  #The update_project_version is done before deployment to validate that the change of project files does not break installation
+  #The update_project_version.sh is done before deployment to validate that the change of project files does not break installation
   - bash .travis/update_project_version.sh
-  - git config --global user.email "builds@travis-ci.com"
-  - git config --global user.name "${UTPLSQL_BUILD_USER_NAME}"
-  - git remote rm origin
-  - git remote add origin https://${github_api_token}@github.com/${UTPLSQL_REPO}
   # download latest utPLSQL release
   #- curl -LOk $(curl --silent https://api.github.com/repos/utPLSQL/utPLSQL/releases/latest | awk '/browser_download_url/ { print $2 }' | grep ".zip" | sed 's/"//g')
   - git clone --depth=1 --branch=${SELFTESTING_BRANCH:-master} https://github.com/utPLSQL/utPLSQL.git $UTPLSQL_DIR
@@ -117,6 +113,12 @@ jobs:
       before_script: skip
       script: 
         - if [[ ($TRAVIS_BRANCH == develop) && ($TRAVIS_PULL_REQUEST == false) ]]; then bash .travis/trigger_travis.sh $TRAVIS_ACCESS_TOKEN; fi
+        - #The update_project_version.sh needs to be done before pushing changes to develop branch
+        - bash .travis/update_project_version.sh
+        - git config --global user.email "builds@travis-ci.com"
+        - git config --global user.name "${UTPLSQL_BUILD_USER_NAME}"
+        - git remote rm origin
+        - git remote add origin https://${github_api_token}@github.com/${UTPLSQL_REPO}
         - if [[ ! $TRAVIS_TAG ]]; then bash .travis/push_release_version.sh; fi
         - bash .travis/build_docs.sh
         - bash .travis/push_docs_to_gh_pages.sh
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
@@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is
    *
    */
 
-  gc_version                 constant varchar2(50) := 'v3.1.2.2016-develop';
+  gc_version                 constant varchar2(50) := 'v3.1.2.2041-develop';
 
   /* Constants: Event names */
   subtype t_event_name           is varchar2(30);

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is`
`21`	`21`	`*`
`22`	`22`	`*/`
`23`	`23`
`24`		`- gc_version constant varchar2(50) := 'v3.1.2.2016-develop';`
	`24`	`+ gc_version constant varchar2(50) := 'v3.1.2.2041-develop';`
`25`	`25`
`26`	`26`	`/* Constants: Event names */`
`27`	`27`	`subtype t_event_name is varchar2(30);`