Merge pull request #60 from jongough/release_test

Update to look for /master, in git show to hopefully get master branc…
jongough · May 6, 2020 · 2ffc9b4 · 2ffc9b4
2 parents cf32b99 + 7379329
commit 2ffc9b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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