diff --git a/.travis.yml b/.travis.yml index 24c07df77c..e546edc3bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,6 @@ matrix: - make copy_resources - xvfb-run -a ctest - make gcov - - make copy_coverage - > if [ "${TRAVIS_SECURE_ENV_VARS}" == "true" ]; then sonar-scanner -X -D"sonar.projectVersion=CI-${TRAVIS_JOB_NUMBER}"; @@ -106,7 +105,6 @@ matrix: script: - ninja - - ninja copy_resources - xvfb-run -a ctest - sh ./tools/CI/upload-CI-build.sh - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then doxygen Doxyfile; fi @@ -131,7 +129,6 @@ matrix: script: - make - - make copy_resources - ctest - make package diff --git a/appveyor.yml b/appveyor.yml index 0bc3a37e3b..7baed4de8d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,10 +10,16 @@ environment: secure: PbT7/2muaC99K24vd6d+DMQETnal230eqmdPtw4tn+zqhwkKpSRIJgjRmJPxphBF install: - cmd: >- - git submodule update --init --recursive - choco install ninja -y + choco source add -n=AFG -s="https://api.bintray.com/nuget/anotherfoxguy/choco-pkg" + + choco install conan -y + + refreshenv + + git submodule update --init --recursive + call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" build_script: - cmd: >- @@ -21,8 +27,6 @@ build_script: ninja - ninja copy_resources - test_script: ctest -VV