Fix forwardslashes in package name on AppVeyor

This commit is contained in:
Oliver Hamlet
2019-10-21 18:08:18 +01:00
parent ffd62f9e0c
commit c144f7a66c
2 changed files with 5 additions and 2 deletions
+2
View File
@@ -163,6 +163,8 @@ IF (GIT_FOUND)
ELSEIF (DEFINED ENV{TRAVIS_BRANCH})
set(GIT_DESCRIBE_STRING "${GIT_DESCRIBE_STRING}_$ENV{TRAVIS_BRANCH}")
ENDIF()
string(REPLACE "/" "-" GIT_DESCRIBE_STRING ${GIT_DESCRIBE_STRING})
ELSE()
SET (GIT_DESCRIBE_STRING "unknown-version")
ENDIF ()
+3 -2
View File
@@ -45,9 +45,10 @@ after_test:
- cd %APPVEYOR_BUILD_FOLDER%\build
- cpack -C %CONFIGURATION%
- ps: $env:GIT_DESCRIBE = ((git describe --tags --long --always) | Out-String) -replace "`n|`r", ""
- ps: $env:PACKAGE_VERSION = $env:GIT_DESCRIBE + "_" + ($env:APPVEYOR_REPO_BRANCH.replace("/", "-"))
artifacts:
- path: build\package\loot_api_python-$(GIT_DESCRIBE)_$(APPVEYOR_REPO_BRANCH)-python$(PYTHON_VERSION)-win$(ARCHITECTURE).zip
- path: build\package\loot_api_python-$(PACKAGE_VERSION)-python$(PYTHON_VERSION)-win$(ARCHITECTURE).zip
name: loot_api_python
deploy:
@@ -58,7 +59,7 @@ deploy:
subject: loot
repo: snapshots
package: loot-api-python
version: $(GIT_DESCRIBE)_$(APPVEYOR_REPO_BRANCH)
version: $(PACKAGE_VERSION)
publish: true
artifact: loot_api_python