diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-09-08 00:55:51 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-09-09 12:49:34 +0300 |
| commit | 21e2315afd90e844963ca1c982ba70a4e001efaf (patch) | |
| tree | 7d4ce224d3b69afb3e7bbfc5657969b6b1ba1fe8 | |
| parent | 6cf5cb58426c36d738a511c7f559cddc175bf816 (diff) | |
| download | meson-21e2315afd90e844963ca1c982ba70a4e001efaf.zip meson-21e2315afd90e844963ca1c982ba70a4e001efaf.tar.gz meson-21e2315afd90e844963ca1c982ba70a4e001efaf.tar.bz2 | |
Remove coverage because pip is broken in Travis.
| -rw-r--r-- | .appveyor.yml | 11 | ||||
| -rw-r--r-- | .travis.yml | 6 |
2 files changed, 1 insertions, 16 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 77d00af..d8a4b12 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -88,22 +88,13 @@ install: c:\projects\MSMpiSetup.exe -unattend -full } - # Install additional packages needed for all builds. - - cmd: "%WRAPPER% %PYTHON% -m pip install codecov" - build_script: - cmd: echo No build step. - cmd: if %backend%==ninja ( %WRAPPER% ninja.exe --version ) else ( MSBuild /version & echo. ) test_script: - cmd: echo Running tests for %arch% and %compiler% with the %backend% backend - - cmd: "%WRAPPER% %PYTHON% run_tests.py --cov --backend=%backend%" - -after_test: - - cmd: "%WRAPPER% %PYTHON% -m coverage combine" - # Generate XML report manually because codecov module doesn't know how to run it properly. - - cmd: "%WRAPPER% %PYTHON% -m coverage xml" - - cmd: "%WRAPPER% %PYTHON% -m codecov -X search pycov -f coverage.xml -n windows-%arch%-%compiler%-%backend%" + - cmd: "%WRAPPER% %PYTHON% run_tests.py --backend=%backend%" on_finish: - set "PATH=%ORIG_PATH%" diff --git a/.travis.yml b/.travis.yml index 724f9ad..3a4ef5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,6 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ninja python3; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull jpakkane/mesonci:zesty; fi - - pip3 install codecov - - mkdir .coverage # We need to copy the current checkout inside the Docker container, # because it has the MR id to be tested checked out. @@ -50,7 +48,3 @@ script: /bin/sh -c "cd /root && CC=$CC CXX=$CXX OBJC=$CC OBJCXX=$CXX ./run_tests.py --cov -- $MESON_ARGS && chmod -R a+rwX .coverage" fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then SDKROOT=$(xcodebuild -version -sdk macosx Path) OBJC=$CC OBJCXX=$CXX ./run_tests.py --cov --backend=ninja -- $MESON_ARGS ; fi - -after_success: - - coverage3 combine - - codecov -n "${TRAVIS_OS_NAME}-${CC}-{$(echo ${MESON_ARGS} | sed -e 's/^--//g' -e 's/ --/,/g')}" |