JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

revert 1a01b46

Browse Source
This commit is contained in:
Michael Tryby
2019-04-02 15:47:06 -04:00
parent 3ba40015b2
commit ddf0a088db
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
appveyor.yml
View File

@@ -20,23 +20,14 @@ environment:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
GENERATOR: "Visual Studio 15 2017" GENERATOR: "Visual Studio 15 2017"
GROUP: "SUPPORTED" GROUP: "SUPPORTED"
BUILD_CONFIG: "Release"
BOOST_ROOT: "C:/Libraries/boost_1_67_0" BOOST_ROOT: "C:/Libraries/boost_1_67_0"
PLATFORM: "win32" PLATFORM: "win32"
REF_BUILD_ID: "220dev5" REF_BUILD_ID: "220dev5"
# New build on Visual Studio 15 2017 # New build on Visual Studio 15 2017
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
GENERATOR: "Visual Studio 15 2017 Win64" GENERATOR: "Visual Studio 15 2017 Win64"
GROUP: "EXPERIMENTAL" GROUP: "EXPERIMENTAL"
BUILD_CONFIG: "Release"
BOOST_ROOT: "C:/Libraries/boost_1_67_0"
PLATFORM: "win64"
REF_BUILD_ID: "381_2"
# adding debug configuration so we can monitor memory leaks
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
GENERATOR: "Visual Studio 15 2017 Win64"
GROUP: "EXPERIMENTAL"
BUILD_CONFIG: "Debug"
BOOST_ROOT: "C:/Libraries/boost_1_67_0" BOOST_ROOT: "C:/Libraries/boost_1_67_0"
PLATFORM: "win64" PLATFORM: "win64"
REF_BUILD_ID: "381_2" REF_BUILD_ID: "381_2"
@@ -69,7 +60,7 @@ before_build:
# run custom build script # run custom build script
build_script: build_script:
- cmake --build . --config %BUILD_CONFIG% - cmake --build . --config Release
before_test: before_test:
- cd %EPANET_HOME% - cd %EPANET_HOME%
@@ -79,12 +70,11 @@ before_test:
test_script: test_script:
# run unit tests # run unit tests
- cd %BUILD_HOME%\tests - cd %BUILD_HOME%\tests
- ctest -C %BUILD_CONFIG% --output-on-failure - ctest -C Release --output-on-failure
# run regression tests # run regression tests
- cd %EPANET_HOME% - cd %EPANET_HOME%
- IF "%BUILD_CONFIG%" == "Release" ( - tools\run-nrtest.cmd %REF_BUILD_ID% %SUT_BUILD_ID%
tools\run-nrtest.cmd %REF_BUILD_ID% %SUT_BUILD_ID%
)
on_success: on_success:
- cd %TEST_HOME%\benchmark - cd %TEST_HOME%\benchmark
- IF "%BUILD_CONFIG%" == "Release" ( - IF "%BUILD_CONFIG%" == "Release" (
@@ -98,4 +88,3 @@ on_failure:
7z a benchmark-%PLATFORM%-%SUT_BUILD_ID%.zip .\epanet-%SUT_BUILD_ID% & 7z a benchmark-%PLATFORM%-%SUT_BUILD_ID%.zip .\epanet-%SUT_BUILD_ID% &
appveyor PushArtifact benchmark-%PLATFORM%-%SUT_BUILD_ID%.zip appveyor PushArtifact benchmark-%PLATFORM%-%SUT_BUILD_ID%.zip
) )