From 1e2f1996335120c9d707d1b15f2fe2f56521d30b Mon Sep 17 00:00:00 2001 From: whitequark Date: Tue, 17 May 2016 14:53:36 +0000 Subject: [PATCH] Update CI scripts to respect the vA.B tag name format. --- .travis/build-debian.sh | 2 +- .travis/build-macos.sh | 2 +- appveyor.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis/build-debian.sh b/.travis/build-debian.sh index 9d0a4c05..124e45ba 100755 --- a/.travis/build-debian.sh +++ b/.travis/build-debian.sh @@ -1,6 +1,6 @@ #!/bin/sh -xe -if echo $TRAVIS_TAG | grep ^release-; then BUILD_TYPE=RelWithDebInfo; else BUILD_TYPE=Debug; fi +if echo $TRAVIS_TAG | grep ^v; then BUILD_TYPE=RelWithDebInfo; else BUILD_TYPE=Debug; fi export BUILD_TYPE dpkg-buildpackage -b -us -uc diff --git a/.travis/build-macos.sh b/.travis/build-macos.sh index f6fe8f6c..ec0e7d05 100755 --- a/.travis/build-macos.sh +++ b/.travis/build-macos.sh @@ -1,6 +1,6 @@ #!/bin/sh -xe -if echo $TRAVIS_TAG | grep ^release-; then BUILD_TYPE=RelWithDebInfo; else BUILD_TYPE=Debug; fi +if echo $TRAVIS_TAG | grep ^v; then BUILD_TYPE=RelWithDebInfo; else BUILD_TYPE=Debug; fi mkdir build cd build diff --git a/appveyor.yml b/appveyor.yml index dc5a766a..8078a565 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ before_build: - mkdir build - cd build - set tag=x%APPVEYOR_REPO_TAG_NAME% - - if %tag:~,9% == xrelease- (set BUILD_TYPE=RelWithDebInfo) else (set BUILD_TYPE=Debug) + - if %tag:~,2% == xv (set BUILD_TYPE=RelWithDebInfo) else (set BUILD_TYPE=Debug) - cmake -G"Visual Studio 12" -T v120_xp -DCMAKE_BUILD_TYPE=%BUILD_TYPE% .. build_script: - msbuild "src\solvespace.vcxproj" /verbosity:minimal /property:Configuration=%BUILD_TYPE% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"