From 80f85b429c7cfce70535e68014ed1bf5dcdfbc03 Mon Sep 17 00:00:00 2001
From: j-selby <jselby@jselby.net>
Date: Thu, 10 Aug 2017 14:17:27 +1000
Subject: Implement correct folder structure for CI builds

---
 appveyor.yml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'appveyor.yml')

diff --git a/appveyor.yml b/appveyor.yml
index eb4e7df87..94e9969f5 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -46,13 +46,21 @@ after_build:
         7z a -tzip $MSVC_BUILD_PDB .\build\bin\release\*.pdb
         rm .\build\bin\release\*.pdb
 
-        mkdir nightly
-        Copy-Item .\build\bin\release\* -Destination nightly -Recurse
-        Copy-Item .\license.txt -Destination nightly
-        Copy-Item .\README.md -Destination nightly
+        # Find out which kind of release we are producing by tag name
+        if ($env:APPVEYOR_REPO_TAG_NAME) {
+            $RELEASE_DIST, $RELEASE_VERSION = $env:APPVEYOR_REPO_TAG_NAME.split('-')
+        } else {
+            # There is no repo tag - make assumptions
+            $RELEASE_DIST = "head"
+        }
 
-        7z a -tzip $MSVC_BUILD_NAME nightly\*
-        7z a $MSVC_SEVENZIP nightly
+        mkdir $RELEASE_DIST
+        Copy-Item .\build\bin\release\* -Destination $RELEASE_DIST -Recurse
+        Copy-Item .\license.txt -Destination $RELEASE_DIST
+        Copy-Item .\README.md -Destination $RELEASE_DIST
+
+        7z a -tzip $MSVC_BUILD_NAME $RELEASE_DIST\*
+        7z a $MSVC_SEVENZIP $RELEASE_DIST
 
 test_script:
   - cd build && ctest -VV -C Release && cd ..
-- 
cgit v1.2.3