From 1e5d266bcb3efa0a1bcd9c3cfeb60b3271016e12 Mon Sep 17 00:00:00 2001
From: Matus Novak <mn00272@surrey.ac.uk>
Date: Mon, 11 Mar 2019 18:23:04 +0000
Subject: [PATCH] Fixing BinTray publishing

---
 appveyor.yml | 16 +++++++++-------
 publish.bat  |  2 +-
 publish.sh   |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a3e1c70..cf85871 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,7 +26,7 @@ environment:
     CMAKE_C_COMPILER: C:/mingw-w64/i686-6.3.0-posix-dwarf-rt_v5-rev1/mingw32/bin/gcc.exe
     CMAKE_CXX_COMPILER: C:/mingw-w64/i686-6.3.0-posix-dwarf-rt_v5-rev1/mingw32/bin/g++.exe
     BINTRAY_API_KEY:
-      secure: rIlpnd+V2lGd4D3H8UniaVHhzX0qmJQx4AhaKgd6pD9iFURsxu8IiM8dAWElSalo
+      secure: +HBoI2BoaYmmPEIu4cfTvqIlRKe5urKleCc5mg7b7Y642+eZbq4fDzrOG9hGjJ6U
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
     COMPILER: mingw
     TOOLSET: w64-mingw32
@@ -36,7 +36,7 @@ environment:
     CMAKE_C_COMPILER: C:/mingw-w64/x86_64-6.3.0-posix-seh-rt_v5-rev1/mingw64/bin/gcc.exe
     CMAKE_CXX_COMPILER: C:/mingw-w64/x86_64-6.3.0-posix-seh-rt_v5-rev1/mingw64/bin/g++.exe
     BINTRAY_API_KEY:
-      secure: rIlpnd+V2lGd4D3H8UniaVHhzX0qmJQx4AhaKgd6pD9iFURsxu8IiM8dAWElSalo
+      secure: +HBoI2BoaYmmPEIu4cfTvqIlRKe5urKleCc5mg7b7Y642+eZbq4fDzrOG9hGjJ6U
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     COMPILER: msvc
     MINGW_DIR_BIN: ''
@@ -44,7 +44,7 @@ environment:
     ARCH: win32
     GENERATOR: '"Visual Studio 15 2017"'
     BINTRAY_API_KEY:
-      secure: rIlpnd+V2lGd4D3H8UniaVHhzX0qmJQx4AhaKgd6pD9iFURsxu8IiM8dAWElSalo
+      secure: +HBoI2BoaYmmPEIu4cfTvqIlRKe5urKleCc5mg7b7Y642+eZbq4fDzrOG9hGjJ6U
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     COMPILER: msvc
     MINGW_DIR_BIN: ''
@@ -52,7 +52,7 @@ environment:
     ARCH: win64
     GENERATOR: '"Visual Studio 15 2017 Win64"'
     BINTRAY_API_KEY:
-      secure: rIlpnd+V2lGd4D3H8UniaVHhzX0qmJQx4AhaKgd6pD9iFURsxu8IiM8dAWElSalo
+      secure: +HBoI2BoaYmmPEIu4cfTvqIlRKe5urKleCc5mg7b7Y642+eZbq4fDzrOG9hGjJ6U
 
 #---------------------------------#
 #            steps                #
@@ -73,9 +73,6 @@ build_script:
 - cmd: if [%COMPILER%]==[mingw] (cd build-release & cmake --build . --target install || exit 1 & cd ..)
 - cmd: if [%COMPILER%]==[msvc] (cd build & cmake --build . --target INSTALL --config Debug || exit 1 & cd ..)
 - cmd: if [%COMPILER%]==[msvc] (cd build & cmake --build . --target INSTALL --config MinSizeRel || exit 1 & cd ..)
-- ps: $env:GITHUB_REPO_TAG = git describe
-- cmd: 7z.exe a rew-%GITHUB_REPO_TAG%-%ARCH%-%TOOLSET%.zip .\install\*
-- cmd: .\publish.bat rew-%GITHUB_REPO_TAG%-%ARCH%-%TOOLSET%.zip %GITHUB_REPO_TAG% 
 
 test_script:
 - cmd: if [%COMPILER%]==[mingw] (cd build-debug & ctest --verbose --output-on-failure || exit 1 & cd ..)
@@ -83,6 +80,11 @@ test_script:
 - cmd: if [%COMPILER%]==[msvc] (cd build & ctest --verbose --output-on-failure -C "Debug" || exit 1 & cd ..)
 - cmd: if [%COMPILER%]==[msvc] (cd build & ctest --verbose --output-on-failure -C "MinSizeRel" || exit 1 & cd ..)
 
+deploy_script:
+- ps: $env:GITHUB_REPO_TAG = git describe
+- cmd: 7z.exe a rew-%GITHUB_REPO_TAG%-%ARCH%-%TOOLSET%.zip .\install\*
+- cmd: .\publish.bat rew-%GITHUB_REPO_TAG%-%ARCH%-%TOOLSET%.zip %GITHUB_REPO_TAG% 
+
 #---------------------------------#
 #         notifications           #
 #---------------------------------#
diff --git a/publish.bat b/publish.bat
index 0ea9b4d..204da25 100644
--- a/publish.bat
+++ b/publish.bat
@@ -1,4 +1,4 @@
 echo off
 echo "Publishing %1 as version %2"
-curl -T %1 -v -umatusnov:%BINTRAY_API_KEY% https://api.bintray.com/content/matusnov/radio-enabled-web/release/%2/
+curl --fail -T %1 -umatusnov:%BINTRAY_API_KEY% https://api.bintray.com/content/matusnov/radio-enabled-web/release/%2/
 exit 0
diff --git a/publish.sh b/publish.sh
index b7086ab..0116fb7 100644
--- a/publish.sh
+++ b/publish.sh
@@ -1,2 +1,2 @@
 echo "Publishing $1 as version $2"
-curl -T $1 -v -umatusnov:%BINTRAY_API_KEY% https://api.bintray.com/content/matusnov/radio-enabled-web/release/$2/
+curl --fail -T $1 -umatusnov:$BINTRAY_API_KEY https://api.bintray.com/content/matusnov/radio-enabled-web/release/$2/
-- 
GitLab