From 42ff5e703b19a67cd7b8006ed2c7356088bad401 Mon Sep 17 00:00:00 2001 From: Peter Cummuskey Date: Sun, 19 Mar 2017 11:55:53 +1300 Subject: [PATCH 1/5] Adding appveyor config --- appveyor.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..0b21923 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,11 @@ +version: 1.0.{build} +pull_requests: + do_not_increment_build_number: true +build: + verbosity: minimal +deploy: +- provider: GitHub + auth_token: + secure: Ec0RLkIirpuLD2eNfFlN51Jsxv737ZVX9kcwNlxSBd8A/eTn/uYvpN/nAMctsHUq + on: + branch: master \ No newline at end of file From fd253421b5c2631a77ad86af2f8f454f609cd853 Mon Sep 17 00:00:00 2001 From: pcummuskey Date: Sun, 19 Mar 2017 14:48:36 +1300 Subject: [PATCH 2/5] Switching to dotfile version and updating config. --- .appveyor.yml | 33 +++++++++++++++++++++++++++++++++ appveyor.yml | 11 ----------- 2 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 .appveyor.yml delete mode 100644 appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..986b7d5 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,33 @@ +version: 1.0.1.{build} + +pull_requests: + do_not_increment_build_number: true + +branches: + except: + - gh-pages + +environment: + matrix: + + - platform: x86 + QTDIR: C:\Qt\5.7\msvc2015 + + - platform: x64 + QTDIR: C:\Qt\5.7\msvc2015_64 + +build: + project: GLoSC.sln + verbosity: normal + +artifacts: + - TargetConfig.ini + +deploy: + + - provider: GitHub + auth_token: + secure: Ec0RLkIirpuLD2eNfFlN51Jsxv737ZVX9kcwNlxSBd8A/eTn/uYvpN/nAMctsHUq + on: + appveyor_repo_tag: true + diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 0b21923..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: 1.0.{build} -pull_requests: - do_not_increment_build_number: true -build: - verbosity: minimal -deploy: -- provider: GitHub - auth_token: - secure: Ec0RLkIirpuLD2eNfFlN51Jsxv737ZVX9kcwNlxSBd8A/eTn/uYvpN/nAMctsHUq - on: - branch: master \ No newline at end of file From 50c7559339a30cd3c59ab55ea10ff4898dc00993 Mon Sep 17 00:00:00 2001 From: pcummuskey Date: Sun, 19 Mar 2017 14:58:52 +1300 Subject: [PATCH 3/5] Attempting to fix build config. --- .appveyor.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 986b7d5..6ec9262 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,14 +20,21 @@ build: project: GLoSC.sln verbosity: normal +after_build: + - 7z a GloSC_%platform%.zip TargetConfig.ini + artifacts: - - TargetConfig.ini + - path: GLoSC_$(platform).zip + name: GLoSC_$(platform) deploy: - provider: GitHub + description: 'Would be nice to auto-generate this...' + artifact: /GLoSC_x..\.zip/ auth_token: secure: Ec0RLkIirpuLD2eNfFlN51Jsxv737ZVX9kcwNlxSBd8A/eTn/uYvpN/nAMctsHUq + force_update: true on: appveyor_repo_tag: true From bf98c9f9f96347eb1cfe9d70480c022a6745dc99 Mon Sep 17 00:00:00 2001 From: pcummuskey Date: Sun, 19 Mar 2017 15:26:40 +1300 Subject: [PATCH 4/5] Fiddling with the zip configuration. --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6ec9262..308fdfd 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -21,7 +21,7 @@ build: verbosity: normal after_build: - - 7z a GloSC_%platform%.zip TargetConfig.ini + - 7z a GloSC_%platform%.zip * artifacts: - path: GLoSC_$(platform).zip From 3e4715baa62451aea087632e661801c62d9f0850 Mon Sep 17 00:00:00 2001 From: pcummuskey Date: Sun, 19 Mar 2017 15:52:23 +1300 Subject: [PATCH 5/5] Narrowing artefact zipping. --- .appveyor.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 308fdfd..c117858 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -12,16 +12,23 @@ environment: - platform: x86 QTDIR: C:\Qt\5.7\msvc2015 + OUTNAME: Win32 - platform: x64 QTDIR: C:\Qt\5.7\msvc2015_64 + OUTNAME: x64 build: project: GLoSC.sln verbosity: normal after_build: - - 7z a GloSC_%platform%.zip * + - "7z a GloSC_%platform%.zip + TargetConfig.ini + %APPVEYOR_BUILD_FOLDER%\build\%OUTNAME%\%configuration%\* + %APPVEYOR_BUILD_FOLDER%\build\Win32Only\%configuration%\* + %APPVEYOR_BUILD_FOLDER%\dependencies\SFML-2.4.1-$(platform)\bin + %APPVEYOR_BUILD_FOLDER%\dependencies\ViGEmUM\$(platform)\bin" artifacts: - path: GLoSC_$(platform).zip