Compare commits

...

9 Commits

Author SHA1 Message Date
Norman Ziebal
aec429f18b Syntax Fix 2019-05-17 00:23:07 -07:00
Norman Ziebal
0444172c71 Testing appveyor messages. 2019-05-16 23:59:08 -07:00
Norman Ziebal
ed2473492f Reenabled all CI tasks. 2019-05-15 22:04:13 +02:00
Norman Ziebal
de1256c3be exclude test 2019-05-14 23:47:11 -07:00
Norman Ziebal
24e43ff68e Enforced VS 2017 image for codeanalysis. Temporary disabled all other builds for faster results. 2019-05-14 01:44:54 -07:00
Norman Ziebal
05fda5caa4 increased VS version for codeanalysis. 2019-05-14 01:07:25 -07:00
Norman Ziebal
7261cda9d0 follow up 2019-05-14 00:30:49 -07:00
Norman Ziebal
10c50cb64f CI: Codechecker update 2019-05-13 23:55:57 -07:00
Norman Ziebal
ab7810aee1 init cppcore ruleset 2019-05-02 02:42:11 +02:00
4 changed files with 37 additions and 5 deletions

View File

@ -1,4 +1,5 @@
image: Visual Studio 2013 image: Visual Studio 2013
# This is the default location, but we put it here for safety reasons, since we use it in our test script # This is the default location, but we put it here for safety reasons, since we use it in our test script
clone_folder: c:\projects\rathena clone_folder: c:\projects\rathena
# We do not need the git history for our integration tests # We do not need the git history for our integration tests
@ -6,23 +7,43 @@ clone_depth: 50
version: '{branch}-{build}' version: '{branch}-{build}'
pull_requests: pull_requests:
do_not_increment_build_number: true do_not_increment_build_number: true
environment: environment:
matrix: matrix:
- VisualStudioVersion: 14.0 - VisualStudioVersion: 14.0
Defines: "\"BUILDBOT\"" Defines: "\"BUILDBOT\""
- VisualStudioVersion: 14.0 - VisualStudioVersion: 14.0
Defines: "\"BUILDBOT;PRERE\"" Defines: "\"BUILDBOT;PRERE\""
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
VisualStudioVersion: 15.0
Defines: "\"CODEANALYSIS\""
platform: platform:
- Win32 - Win32
- x64 - x64
configuration: configuration:
- Debug - Debug
# Disable Release for now, since do not want to have any optimization and have access to debug infos on crash # Disable Release for now, since do not want to have any optimization and have access to debug infos on crash
# - Release # - Release
matrix: matrix:
# Minimizing CI time. Should be enough to check guidelines only for one platform.
exclude:
- platform: x64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
fast_finish: true fast_finish: true
build_script: build_script:
- cmd: msbuild rAthena.sln /p:DefineConstants=%Defines% - cmd: msbuild rAthena.sln /p:DefineConstants=%Defines% | tee result.txt
after_build:
- ps: >-
if ($env:Defines -eq "CODEANALYSIS") {
$warnings = tail -n 5 result.txt | head -n 1
Add-AppveyorMessage -Message $warnings -Category Information
}
services: mysql services: mysql
test_script: test_script:
- cmd: >- - cmd: >-

View File

@ -66,6 +66,10 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(DefineConstants)'=='CODEANALYSIS'">
<CodeAnalysisRuleSet>CppCoreCheckRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)</OutDir> <OutDir>$(SolutionDir)</OutDir>
@ -213,4 +217,4 @@
<Copy SourceFiles="$(SolutionDir)tools\charserv.bat" DestinationFolder="$(SolutionDir)" ContinueOnError="true" Condition="!Exists('$(SolutionDir)charserv.bat')" /> <Copy SourceFiles="$(SolutionDir)tools\charserv.bat" DestinationFolder="$(SolutionDir)" ContinueOnError="true" Condition="!Exists('$(SolutionDir)charserv.bat')" />
<Copy SourceFiles="$(SolutionDir)tools\runserver.bat" DestinationFolder="$(SolutionDir)" ContinueOnError="true" Condition="!Exists('$(SolutionDir)runserver.bat')" /> <Copy SourceFiles="$(SolutionDir)tools\runserver.bat" DestinationFolder="$(SolutionDir)" ContinueOnError="true" Condition="!Exists('$(SolutionDir)runserver.bat')" />
</Target> </Target>
</Project> </Project>

View File

@ -66,6 +66,10 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(DefineConstants)'=='CODEANALYSIS'">
<CodeAnalysisRuleSet>CppCoreCheckRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)</OutDir> <OutDir>$(SolutionDir)</OutDir>
@ -187,4 +191,4 @@
<Copy SourceFiles="$(SolutionDir)tools\logserv.bat" DestinationFolder="$(SolutionDir)" ContinueOnError="true" Condition="!Exists('$(SolutionDir)logserv.bat')" /> <Copy SourceFiles="$(SolutionDir)tools\logserv.bat" DestinationFolder="$(SolutionDir)" ContinueOnError="true" Condition="!Exists('$(SolutionDir)logserv.bat')" />
<Copy SourceFiles="$(SolutionDir)tools\runserver.bat" DestinationFolder="$(SolutionDir)" ContinueOnError="true" Condition="!Exists('$(SolutionDir)runserver.bat')" /> <Copy SourceFiles="$(SolutionDir)tools\runserver.bat" DestinationFolder="$(SolutionDir)" ContinueOnError="true" Condition="!Exists('$(SolutionDir)runserver.bat')" />
</Target> </Target>
</Project> </Project>

View File

@ -66,6 +66,10 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(DefineConstants)'=='CODEANALYSIS'">
<CodeAnalysisRuleSet>CppCoreCheckRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)</OutDir> <OutDir>$(SolutionDir)</OutDir>
@ -372,5 +376,4 @@
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\statpoint.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\statpoint.txt')" /> <Copy SourceFiles="$(SolutionDir)db\import-tmpl\statpoint.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\statpoint.txt')" />
<Copy SourceFiles="$(SolutionDir)db\import-tmpl\status_disabled.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\status_disabled.txt')" /> <Copy SourceFiles="$(SolutionDir)db\import-tmpl\status_disabled.txt" DestinationFolder="$(SolutionDir)db\import\" ContinueOnError="true" Condition="!Exists('$(SolutionDir)db\import\status_disabled.txt')" />
</Target> </Target>
</Project> </Project>