From 7379329e27746e46c3ccc6868feaa6cf276fd5ea Mon Sep 17 00:00:00 2001 From: jongough Date: Wed, 6 May 2020 15:10:36 +1000 Subject: [PATCH] Update to look for /master, in git show to hopefully get master branch build --- CMakeLists.txt | 4 ++-- cmake/in-files/cloudsmith-upload.sh.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c525a5eae..fb4005086 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,8 +26,8 @@ set(PACKAGE "testplugin") set(VERSION_MAJOR "1") set(VERSION_MINOR "0") -set(VERSION_PATCH "87") -set(VERSION_TWEAK "1") +set(VERSION_PATCH "88") +set(VERSION_TWEAK "0") set(VERSION_DATE "06/05/2020") set(OCPN_MIN_VERSION "ov50") set(OCPN_API_VERSION_MAJOR "1") diff --git a/cmake/in-files/cloudsmith-upload.sh.in b/cmake/in-files/cloudsmith-upload.sh.in index 7705fe6a5..4ed0a7e91 100644 --- a/cmake/in-files/cloudsmith-upload.sh.in +++ b/cmake/in-files/cloudsmith-upload.sh.in @@ -113,7 +113,7 @@ if [ "$BUILD_TAG" = "" ] && [ "$tag" != "" ]; then fi if [ "$BUILD_BRANCH" = "" ]; then build_commit=$(git show -s --format=%d $BUILD_TAG) - is_master=$(echo $build_commit | awk '/ master/ {print}') + is_master=$(echo $build_commit | awk '/\/master/ {print}') if [ "$is_master" != "" ]; then BUILD_BRANCH="master" fi