From 689d80e07740748182bac4f4e54667bf8b07c20f Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sun, 8 Feb 2015 12:23:33 -0200 Subject: [PATCH 1/2] Appveyor: Do x64 builds --- appveyor.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 06c9a7909..0f8fd50aa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,14 +5,14 @@ os: unstable clone_depth: 1 environment: - QTDIR: C:\Qt\5.4\msvc2013_opengl + QTDIR: C:\Qt\5.4\msvc2013_64_opengl MEGA_EMAIL: secure: rEo9CGAYX87GKTqZCZ9vLCNCNqxO5JLgbERaHF3YJWg= MEGA_PASSWORD: secure: zE1zmgjS/6GfN/19ROl/O0fVR58svORQ5gdtsxI7J8k= platform: - - Win32 + - x64 configuration: - Release @@ -23,7 +23,7 @@ install: before_build: - mkdir build - cd build - - cmake .. + - cmake -G "Visual Studio 12 Win64" .. - cd .. after_build: @@ -32,16 +32,16 @@ after_build: - wget -q http://megatools.megous.com/builds/megatools-1.9.94-win64.zip # extract megatools silently. See http://stackoverflow.com/a/11629736/1748450 - 7z x megatools-1.9.94-win64.zip | FIND /V "ing " - # copy the qt dlls - - copy C:\Qt\5.4\msvc2013_opengl\bin\icudt53.dll build\bin\release - - copy C:\Qt\5.4\msvc2013_opengl\bin\icuin53.dll build\bin\release - - copy C:\Qt\5.4\msvc2013_opengl\bin\icuuc53.dll build\bin\release - - copy C:\Qt\5.4\msvc2013_opengl\bin\Qt5Core.dll build\bin\release - - copy C:\Qt\5.4\msvc2013_opengl\bin\Qt5Gui.dll build\bin\release - - copy C:\Qt\5.4\msvc2013_opengl\bin\Qt5OpenGL.dll build\bin\release - - copy C:\Qt\5.4\msvc2013_opengl\bin\Qt5Widgets.dll build\bin\release + # copy the qt dlls + - copy C:\Qt\5.4\msvc2013_64_opengl\bin\icudt53.dll build\bin\release + - copy C:\Qt\5.4\msvc2013_64_opengl\bin\icuin53.dll build\bin\release + - copy C:\Qt\5.4\msvc2013_64_opengl\bin\icuuc53.dll build\bin\release + - copy C:\Qt\5.4\msvc2013_64_opengl\bin\Qt5Core.dll build\bin\release + - copy C:\Qt\5.4\msvc2013_64_opengl\bin\Qt5Gui.dll build\bin\release + - copy C:\Qt\5.4\msvc2013_64_opengl\bin\Qt5OpenGL.dll build\bin\release + - copy C:\Qt\5.4\msvc2013_64_opengl\bin\Qt5Widgets.dll build\bin\release - mkdir build\bin\release\platforms\ - - copy C:\Qt\5.4\msvc2013_opengl\plugins\platforms\qwindows.dll build\bin\release\platforms + - copy C:\Qt\5.4\msvc2013_64_opengl\plugins\platforms\qwindows.dll build\bin\release\platforms # zip up the build folder -> build.7z - 7z a build .\build\bin\release\* # rename, upload to Mega From 6638bf3b9b0d9ec8d8ffea4c8461536ba4da3c9d Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sun, 8 Feb 2015 12:23:33 -0200 Subject: [PATCH 2/2] Appveyor: Adjust clone depth settings The submodule update was doing a full clone. Also increase clone depth a bit, since it can apparently cause issues checking out the source if there are too many concurrent PRs trying to build (causing the commit for the build to not be the top one on the repository anymore). --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0f8fd50aa..c9edb9e19 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ os: unstable # shallow clone -clone_depth: 1 +clone_depth: 5 environment: QTDIR: C:\Qt\5.4\msvc2013_64_opengl @@ -18,7 +18,7 @@ configuration: - Release install: - - git submodule update --init --recursive + - git submodule update --init --recursive --depth 20 before_build: - mkdir build