From 5416bb15c34bfb56a4dec6bddafb653c3be9a187 Mon Sep 17 00:00:00 2001
From: davide-romanini <davide.romanini@gmail.com>
Date: Tue, 24 Sep 2019 23:36:08 +0100
Subject: [PATCH] Appveyor GitHub release (#139)

---
 Makefile              |  3 ++-
 appveyor.yml          | 16 ++++++++++++++--
 windows/deps.ps1      |  5 -----
 windows/env.ps1       |  3 ---
 windows/fullbuild.ps1 |  2 +-
 windows/provision.ps1 | 11 -----------
 6 files changed, 17 insertions(+), 23 deletions(-)
 delete mode 100644 windows/deps.ps1
 delete mode 100644 windows/env.ps1
 delete mode 100644 windows/provision.ps1

diff --git a/Makefile b/Makefile
index bf3ad96..c863151 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
 VERSION_STR := $(shell python -c 'import comictaggerlib.ctversion; print( comictaggerlib.ctversion.version)')
 
 ifeq ($(OS),Windows_NT)
+	OS_VERSION=win-$(PROCESSOR_ARCHITECTURE)
 	APP_NAME=comictagger.exe
-	FINAL_NAME=ComicTagger-$(VERSION_STR).exe
+	FINAL_NAME=ComicTagger-$(VERSION_STR)-$(OS_VERSION).exe
 else ifeq ($(shell uname -s),Darwin)
 	OS_VERSION=osx-$(shell defaults read loginwindow SystemVersionStampAsString)-$(shell uname -m)
 	APP_NAME=ComicTagger.app
diff --git a/appveyor.yml b/appveyor.yml
index 824af47..7fcf640 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,5 +2,17 @@ version: 1.0.{build}
 build_script:
 - cmd: powershell -exec bypass -File windows\fullbuild.ps1
 artifacts:
-- path: dist\*.exe
-  name: ComicTagger
\ No newline at end of file
+- path: dist\*.zip
+  name: ComicTagger
+deploy:
+  description: New Windows Release
+  provider: GitHub
+  auth_token:
+    secure: GftVXNVTfnfWxlCIWNsufQjgrLqGPbrhK7bddzZ+6onYbbx6vEKWku0QMZjcxq/D
+  draft: true
+  prerelease: false
+  artifact: ComicTagger
+  on:
+    branch: master
+    APPVEYOR_REPO_TAG: true
+    
\ No newline at end of file
diff --git a/windows/deps.ps1 b/windows/deps.ps1
deleted file mode 100644
index 460243e..0000000
--- a/windows/deps.ps1
+++ /dev/null
@@ -1,5 +0,0 @@
-# to be run inside comictagger folder
-# installs conda and pip dependencies
-activate comictagger
-conda install -y pyqt=4
-pip install -r .\requirements.txt
\ No newline at end of file
diff --git a/windows/env.ps1 b/windows/env.ps1
deleted file mode 100644
index f1d4591..0000000
--- a/windows/env.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-$env:PATH+=";C:\ProgramData\Miniconda2\Scripts;C:\ProgramData\Miniconda2"
-$env:PATH+=";C:\tools\mingw64\bin"
-Set-Alias make mingw32-make.exe -scope Global
\ No newline at end of file
diff --git a/windows/fullbuild.ps1 b/windows/fullbuild.ps1
index fc46820..2c48cf3 100644
--- a/windows/fullbuild.ps1
+++ b/windows/fullbuild.ps1
@@ -1,5 +1,5 @@
 # Script to be run inside appveyor for a full build
-choco install -y mingw
+choco install -y mingw zip
 refreshenv
 $env:PATH="C:\Python36-x64;$env:path"
 python -m venv venv
diff --git a/windows/provision.ps1 b/windows/provision.ps1
deleted file mode 100644
index 8789083..0000000
--- a/windows/provision.ps1
+++ /dev/null
@@ -1,11 +0,0 @@
-# This script should be run into an admin PowerShell to install all required
-# packages needed for building comictagger on windows
-#
-# NOTE: this script has not been fully tested on a fresh windows VM.
-#
-# install chocolatey
-Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-choco install -y git mingw miniconda
-$env:PATH+=";C:\ProgramData\Miniconda2\Scripts;C:\ProgramData\Miniconda2"
-$env:PATH+=";C:\tools\mingw64\bin"
-conda create -y --name comictagger python=2
\ No newline at end of file