AppVeyor: Fix incorrect branch in version string

tmp64 · Jun 22, 2020 · e293fe0 · e293fe0
1 parent fccc666
commit e293fe0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -251,7 +251,13 @@ set( BHL_VERSION_STRING "${BHL_VERSION_MAJOR}.${BHL_VERSION_MINOR}.${BHL_VERSION
 if( BHL_VERSION_TAG )
 	set( BHL_VERSION_STRING "${BHL_VERSION_STRING}-${BHL_VERSION_TAG}" )
 endif()
-set( BHL_VERSION_STRING "${BHL_VERSION_STRING}+${GIT_BRANCH}.${GIT_COMMIT_HASH}" )
+
+if( BHL_FORCE_BRANCH )
+	set( BHL_VERSION_STRING "${BHL_VERSION_STRING}+${BHL_FORCE_BRANCH}.${GIT_COMMIT_HASH}" )
+else()
+	set( BHL_VERSION_STRING "${BHL_VERSION_STRING}+${GIT_BRANCH}.${GIT_COMMIT_HASH}" )
+endif()
+
 if( GIT_DIRTY )
 	set( BHL_VERSION_STRING "${BHL_VERSION_STRING}.m" )
 endif()

diff --git a/appveyor.yml b/appveyor.yml
@@ -31,7 +31,7 @@ install:
   - cmd: git submodule update --init --recursive
 
 build_script:
-  - ps: ./scripts/BuildRelease.ps1 -Target $env:TARGET -MakeZip -CMakeArgs "-DBHL_VERSION_METADATA=`"appveyor.${env:APPVEYOR_REPO_BRANCH}.${env:APPVEYOR_BUILD_NUMBER}`"" -Updater
+  - ps: ./scripts/BuildRelease.ps1 -Target $env:TARGET -MakeZip -CMakeArgs "-DBHL_FORCE_BRANCH=`"${env:APPVEYOR_REPO_BRANCH}`"" -Updater
 
 artifacts:
   - path: autobuild/BugfixedHL-*.zip