Skip to content

Commit

Permalink
👷 Updated CI scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
AnotherFoxGuy committed Sep 11, 2019
1 parent 7ca6842 commit 645f79f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
Expand Up @@ -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}";
Expand Down Expand Up @@ -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
Expand All @@ -131,7 +129,6 @@ matrix:

script:
- make
- make copy_resources
- ctest
- make package

Expand Down
12 changes: 8 additions & 4 deletions appveyor.yml
Expand Up @@ -10,19 +10,23 @@ 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: >-
cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DUSE_PMM=ON .
ninja
ninja copy_resources
test_script:
ctest -VV

Expand Down

0 comments on commit 645f79f

Please sign in to comment.