From 0583ad8839a58b38251b410f25bc49ccedc92e4e Mon Sep 17 00:00:00 2001 From: Nomango <569629550@qq.com> Date: Wed, 14 Aug 2019 22:09:22 +0800 Subject: [PATCH] fix appveyor.yml --- appveyor.yml | 46 +++++++++++++++++++++++++------------- src/kiwano/base/window.cpp | 4 ++-- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c4d1800b..dc89cd0d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,20 +2,27 @@ version: 0.9.{build} skip_tags: true +# fetch repository as zip archive +shallow_clone: true + # pull_requests: # do_not_increment_build_number: true +# Do not build feature branch with open Pull Requests +# skip_branch_with_pr: true + # image: # - Visual Studio 2019 # - Visual Studio 2017 # - Visual Studio 2015 environment: - time_out_mins: 5 - job_to_deploy: 6 # 3(images) * 1(platform) * 2(configuration) - flag_to_deploy: false - APPVEYOR_API_TOKEN: - secure: UJFCbRNHMOqQg3e3Kv/ZnaIqqwXAt+5HDldetaZsZ5E= + global: + time_out_mins: 5 + job_to_deploy: 6 # 3(images) * 1(platform) * 2(configuration) + flag_to_deploy: false + appveyor_api_token: + secure: UJFCbRNHMOqQg3e3Kv/ZnaIqqwXAt+5HDldetaZsZ5E= matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 VS_PLATFORM_TOOLSET: v142 @@ -24,6 +31,12 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 VS_PLATFORM_TOOLSET: v140 +matrix: + fast_finish: true # set this flag to immediately finish build once one of the jobs fails + # allow_failures: + # - platform: x86 + # configuration: Debug + skip_commits: message: /\[chore\]/ @@ -34,14 +47,6 @@ only_commits: - scripts/**/*.ps1 - appveyor.yml -for: -- - branches: - except: - - master - only_commits: - message: /\[build\]/ - configuration: - Debug - Release @@ -62,8 +67,19 @@ build: project: projects/Kiwano.sln verbosity: minimal -after_build: -- ps: .\scripts\appveyor\wait_for_other_jobs.ps1 +for: +- + branches: + except: + - master + only_commits: + message: /\[build\]/ +- + branches: + only: + - master + after_build: + - ps: .\scripts\appveyor\wait_for_other_jobs.ps1 artifacts: - path: projects/output/**/*.lib diff --git a/src/kiwano/base/window.cpp b/src/kiwano/base/window.cpp index 98ef3f6b..bc2a5f80 100644 --- a/src/kiwano/base/window.cpp +++ b/src/kiwano/base/window.cpp @@ -18,8 +18,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include "window.h" -#include "logs.h" +#include "Window.h" +#include "Logger.h" #define WINDOW_STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX #define WINDOW_FULLSCREEN_STYLE WS_CLIPCHILDREN | WS_POPUP