diff options
| -rw-r--r-- | .build.yml | 25 | ||||
| -rw-r--r-- | .travis.yml | 27 |
2 files changed, 6 insertions, 46 deletions
@@ -61,7 +61,6 @@ requires: - caja-devel - clang - clang-analyzer - - cppcheck-htmlreport - desktop-file-utils - djvulibre-devel - gcc @@ -139,34 +138,18 @@ before_scripts: - fi build_scripts: - - if [ ${DISTRO_NAME} == "debian" ];then - - export CFLAGS+=" -Wsign-compare -Wunused-macros -Wunused-parameter" - - export CXXFLAGS+=" -Wsign-compare -Wunused-macros -Wunused" - - cppcheck --enable=warning,style,performance,portability,information,missingInclude --force -D__cplusplus . - - fi - - NOCONFIGURE=1 ./autogen.sh - - scan-build $CHECKERS ./configure --enable-compile-warnings=maximum --enable-cxx-warnings=maximum + - scan-build $CHECKERS ./configure - if [ $CPU_COUNT -gt 1 ]; then - - if [ ${DISTRO_NAME} == "debian" ];then - - scan-build $CHECKERS --keep-cc --use-cc=clang --use-c++=clang++ -o html-report make -j $CPU_COUNT - - make clean - - fi - scan-build $CHECKERS --keep-cc -o html-report make -j $CPU_COUNT - else - - if [ ${DISTRO_NAME} == "debian" ];then - - scan-build $CHECKERS --keep-cc --use-cc=clang --use-c++=clang++ -o html-report make - - make clean - - fi - scan-build $CHECKERS --keep-cc -o html-report make - fi + - if [ ${DISTRO_NAME} == "debian" ];then + - cppcheck --enable=warning,style,performance,portability,information,missingInclude --force -D__cplusplus . + - fi after_scripts: - - if [ ${DISTRO_NAME} == "fedora" ];then - - cppcheck --xml --output-file=cppcheck.xml --enable=warning,style,performance,portability,information,missingInclude --force -D__cplusplus . - - cppcheck-htmlreport --title=${REPO_NAME} --file=cppcheck.xml --report-dir=cppcheck-htmlreport - - ./gen-index -l 20 -i https://github.com/${OWNER_NAME}/atril/raw/master/data/icons/16x16/apps/atril.png - - fi - make distcheck releases: diff --git a/.travis.yml b/.travis.yml index aa22c7ae..47fdbd3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,7 @@ branches: before_install: - curl -Ls -o docker-build https://github.com/mate-desktop/mate-dev-scripts/raw/master/travis/docker-build - - curl -Ls -o gen-index https://github.com/mate-desktop/mate-dev-scripts/raw/master/travis/gen-index.sh - - chmod +x docker-build gen-index + - chmod +x docker-build install: - pip3 install PyGithub @@ -27,7 +26,7 @@ script: notifications: irc: - if: (tag OR branch = master) AND + if: (tag OR branch = "1.26") AND repo = mate-desktop/atril channels: - "irc.libera.chat#mate-dev" @@ -38,17 +37,6 @@ notifications: on_failure: always deploy: - - provider: pages - edge: true - token: $GITHUB_TOKEN - keep_history: false - committer_from_gh: true - target_branch: gh-pages - local_dir: html-report - strategy: git - on: - all_branches: true - condition: ${DISTRO} =~ ^fedora.*$ - provider: script edge: true script: ./docker-build --verbose --config .build.yml --release github @@ -56,17 +44,6 @@ deploy: tags: true condition: "${TRAVIS_TAG} =~ ^v.*$ && ${DISTRO} =~ ^fedora.*$" -after_success: - - 'if [[ "$TRAVIS_SECURE_ENV_VARS" == "true" && "$TRAVIS_PULL_REQUEST" != "false" && ${DISTRO} =~ ^fedora.*$ ]]; then - REPO_SLUG_ARRAY=(${TRAVIS_REPO_SLUG//\// }); - REPO_NAME=${REPO_SLUG_ARRAY[1]}; - URL="https://${REPO_NAME}.mate-desktop.dev"; - COMMENT="Code analysis completed"; - curl -H "Authorization: token $GITHUB_TOKEN" -X POST - -d "{\"state\": \"success\", \"description\": \"$COMMENT\", \"context\":\"scan-build\", \"target_url\": \"$URL\"}" - https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${TRAVIS_PULL_REQUEST_SHA}; - fi' - env: # - DISTRO="archlinux:latest" - DISTRO="debian:testing" |