From: Hannah von Reth <vonreth@kde.org>
Date: Mon, 6 Aug 2018 08:51:55 +0000 (+0200)
Subject: Cleanup appveyor artifact upload
X-Git-Tag: 0.13-rc2~81
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=89033faf1329eafaeec6a830d68325e6a27bbd40

Cleanup appveyor artifact upload
---

diff --git a/.appveyor.ini b/.appveyor.ini
index 5452b12c..c27fbb68 100644
--- a/.appveyor.ini
+++ b/.appveyor.ini
@@ -7,6 +7,7 @@ ShallowClone = True
 # The variable names are case sensitive
 [Variables]
 #Root = D:\qt-sdk
+APPVEYOR_BUILD_FOLDER = ${Variables:Root}
 
 # Settings applicable for all Crafts matrices
 # Settings are Category/key=value
@@ -17,6 +18,10 @@ Paths/Python27 = C:\Python27
 ShortPath/Enabled = False
 Compile/BuildType = Release
 ContinuousIntegration/Enabled = True
+Packager/Destination = ${Variables:APPVEYOR_BUILD_FOLDER}/binaries
+
+# the version of the config
+Version/ConfigVersion = 6
 
 [BlueprintSettings]
 quassel/quassel.version = master
diff --git a/.appveyor.yml b/.appveyor.yml
index 0e6a54f0..4b57d7e5 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -13,7 +13,7 @@ install:
 - ps: |
     #use cmd to silence powershell behaviour for stderr
     & cmd /C "git clone -q --depth=1 git://anongit.kde.org/craftmaster.git C:\CraftMaster\CraftMaster 2>&1"
-    & C:\python36\python.exe C:\CraftMaster\CraftMaster\CraftMaster.py --config $env:APPVEYOR_BUILD_FOLDER\.appveyor.ini --target $env:TARGET
+    & C:\python36\python.exe C:\CraftMaster\CraftMaster\CraftMaster.py --config $env:APPVEYOR_BUILD_FOLDER\.appveyor.ini --variables "APPVEYOR_BUILD_FOLDER=$env:APPVEYOR_BUILD_FOLDER" --target $env:TARGET
     craft --add-blueprint-repository https://github.com/quassel/craft-blueprints-quassel.git
     craft -p quassel/quassel
     craft nsis
@@ -23,16 +23,18 @@ build_script:
 - ps: |
     craft --no-cache --src-dir $env:APPVEYOR_BUILD_FOLDER quassel/quassel
 
-test_script:
+after_build:
 - ps: |
-    craft --src-dir $env:APPVEYOR_BUILD_FOLDER --test quassel/quassel
+    craft --src-dir $env:APPVEYOR_BUILD_FOLDER --package quassel/quassel
 
-on_success:
+test_script:
 - ps: |
-    craft --src-dir $env:APPVEYOR_BUILD_FOLDER --package quassel/quassel
-    Get-ChildItem C:\CraftMaster\$env:TARGET\tmp\* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+    craft --src-dir $env:APPVEYOR_BUILD_FOLDER --test quassel/quassel
 
 environment:
     matrix:
     - TARGET: windows-msvc2017_64-cl
     - TARGET: windows-msvc2017_32-cl
+
+artifacts:
+  - path: binaries\*