From 6d6bee30e4fb82b7193498db54c8d3cc78cb09e0 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Fri, 5 Oct 2018 15:31:21 +0200 Subject: Fix line endings in appveyor.yml build-appveyor --- .git-commit-template | 3 + windows/appveyor/appveyor.yml | 131 +++++++++++++++++++++--------------------- 2 files changed, 70 insertions(+), 64 deletions(-) diff --git a/.git-commit-template b/.git-commit-template index cb5ed31..97e0e63 100644 --- a/.git-commit-template +++ b/.git-commit-template @@ -17,3 +17,6 @@ # # --[ Add attribution if patch was contributed ]-----------------------| #SUBMITTED-BY: +# +# --[ Tags ]-----------------------------------------------------------| +# build-appveyor: this build is a stable Windows build diff --git a/windows/appveyor/appveyor.yml b/windows/appveyor/appveyor.yml index 55c5ed9..49a5cfb 100644 --- a/windows/appveyor/appveyor.yml +++ b/windows/appveyor/appveyor.yml @@ -1,64 +1,67 @@ -# version format -version: '{branch}-{build}' - -# branches to build -branches: - only: - - master - -# only build commits with a particular message -only_commits: - message: /build-appveyor/ - author: aqua@iserlohn-fortress.net - -# --- environment configuration --- - -image: Visual Studio 2017 - -# scripts that are called at very beginning, before repo cloning -init: - - git config --global core.autocrlf input - -# We use commit count as a version, so we can't do a shallow clone -#shallow_clone: true -clone_folder: C:\projects\smolbote.git - -environment: - source_dir: C:\projects\smolbote.git - install_dir: C:\projects\smolbote.install - matrix: - - arch: x64 - compiler: msvc2017 - generator: '"Visual Studio 15 2017 Win64"' - -# --- build --- -# script to run after repository is cloned -install: -- cmd: if %arch%==x86 (set QT_ROOT=C:\Qt\5.11\%compiler%) else (set QT_ROOT=C:\Qt\5.11\%compiler%_64) -- cmd: set BOOST_ROOT=C:\Libraries\boost_1_67_0 -- cmd: cd %source_dir% -- cmd: git submodule init -- cmd: git submodule update 3rd-party/SingleApplication/SingleApplication.git - -# build script -build_script: -- cmd: echo Building on %arch% with %compiler% -- cmd: cmake -G %generator% -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%install_dir% -DCMAKE_PREFIX_PATH=%QT_ROOT%;%BOOST_ROOT% -DBoost_USE_STATIC_LIBS=On %source_dir% -- cmd: cmake --build . --target poi --config Release -- cmd: cmake --build . --target install --config Release -- cmd: cd %install_dir% -- cmd: call %QT_ROOT%\bin\windeployqt.exe bin\poi.exe -- cmd: 7z a C:\projects\build.7z %install_dir% - -artifacts: -- path: build.7z - name: release - -# --- notifications --- -notifications: - - provider: Email - to: - - aqua@iserlohn-fortress.net - subject: 'smolbote: build {{status}}' - message: 'version {{branch}}:{{commitId}}' - on_build_status_changed: true +# version format +version: '{branch}-{build}' + +# branches to build +branches: + only: + - master + +# only build commits with a particular message +only_commits: + message: /build-appveyor/ + author: aqua@iserlohn-fortress.net + +# --- environment configuration --- + +image: Visual Studio 2017 + +# scripts that are called at very beginning, before repo cloning +init: + - git config --global core.autocrlf input + +# We use commit count as a version, so we can't do a shallow clone +#shallow_clone: true +clone_folder: C:\projects\smolbote.git + +environment: + source_dir: C:\projects\smolbote.git + install_dir: C:\projects\smolbote.install + matrix: + - arch: x64 + compiler: msvc2017 + generator: '"Visual Studio 15 2017 Win64"' + +# --- build --- +# script to run after repository is cloned +install: +- cmd: if %arch%==x86 (set QT_ROOT=C:\Qt\5.11\%compiler%) else (set QT_ROOT=C:\Qt\5.11\%compiler%_64) +- cmd: set BOOST_ROOT=C:\Libraries\boost_1_67_0 +- cmd: cd %source_dir% +- cmd: git submodule init +- cmd: git submodule update 3rd-party/SingleApplication/SingleApplication.git + +# build script +build_script: +- cmd: echo Building on %arch% with %compiler% +- cmd: cmake -G %generator% -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%install_dir% -DCMAKE_PREFIX_PATH=%QT_ROOT%;%BOOST_ROOT% -DBoost_USE_STATIC_LIBS=On %source_dir% +- cmd: cmake --build . --target poi --config Release +- cmd: cmake --build . --target install --config Release +- cmd: cd %install_dir% +- cmd: call %QT_ROOT%\bin\windeployqt.exe bin\poi.exe +- cmd: 7z a %source_dir%\build.7z %install_dir% + +artifacts: +- path: build.7z + name: release + +# --- notifications --- +notifications: + - provider: Email + to: + - aqua@iserlohn-fortress.net + subject: 'smolbote: build {{status}}' + message: 'version {{branch}}:{{commitId}}\n + Artifacts: {{#artifacts}} + - {{name}} {{permalink}} \n + {{/artifacts}}' + on_build_status_changed: true -- cgit v1.2.1