From c144f7a66cd47178d11c644ac786495950bc23ae Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Sun, 20 Oct 2019 14:11:00 +0100 Subject: [PATCH] Fix forwardslashes in package name on AppVeyor --- CMakeLists.txt | 2 ++ appveyor.yml | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e4948f..2e2af2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 () diff --git a/appveyor.yml b/appveyor.yml index 7866cee..ddb3a0a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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