diff options
| -rw-r--r-- | .build.yml | 31 | ||||
| -rw-r--r-- | .travis.yml | 27 |
2 files changed, 7 insertions, 51 deletions
@@ -64,7 +64,6 @@ requires: - autoconf-archive - clang - clang-analyzer - - cppcheck-htmlreport - dbus-glib-devel - dconf-devel - desktop-file-utils @@ -134,14 +133,9 @@ variables: -enable-checker alpha.unix.cstring.OutOfBounds -enable-checker alpha.core.FixedAddr -enable-checker security.insecureAPI.strcpy"' - - MATE_DESKTOP_VERSION=1.25.0 + - MATE_DESKTOP_VERSION=1.26.0 before_scripts: - - if [ ${DISTRO_NAME} == "debian" ];then - - curl -Ls -o debian.sh https://github.com/mate-desktop/mate-dev-scripts/raw/master/travis/debian.sh - - bash ./debian.sh - - fi - - cd ${START_DIR} - '[ -f mate-desktop-${MATE_DESKTOP_VERSION}.tar.xz ] || curl -Ls -o mate-desktop-${MATE_DESKTOP_VERSION}.tar.xz http://pub.mate-desktop.org/releases/${MATE_DESKTOP_VERSION%.*}/mate-desktop-${MATE_DESKTOP_VERSION}.tar.xz' - tar xf mate-desktop-${MATE_DESKTOP_VERSION}.tar.xz @@ -155,33 +149,18 @@ before_scripts: - make install build_scripts: - - if [ ${DISTRO_NAME} == "debian" ];then - - export CFLAGS+=" -Wsign-compare -Wunused-parameter" - - cppcheck --enable=warning,style,performance,portability,information,missingInclude -i"mate-desktop-${MATE_DESKTOP_VERSION}" . - - fi - - NOCONFIGURE=1 ./autogen.sh - - scan-build $CHECKERS ./configure --prefix=/usr --enable-pulse --enable-compile-warnings=maximum + - scan-build $CHECKERS ./configure --prefix=/usr --enable-pulse - 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 -i"mate-desktop-${MATE_DESKTOP_VERSION}" . + - fi after_scripts: - - if [ ${DISTRO_NAME} == "fedora" ];then - - cppcheck --xml --output-file=cppcheck.xml --enable=warning,style,performance,portability,information,missingInclude -i"mate-desktop-${MATE_DESKTOP_VERSION}" . - - cppcheck-htmlreport --title=${REPO_NAME} --file=cppcheck.xml --report-dir=cppcheck-htmlreport - - ./gen-index -l 20 -i https://github.com/${OWNER_NAME}/mate-applets/raw/master/cpufreq/pixmaps/cpufreq-100.png - - fi - make distcheck releases: diff --git a/.travis.yml b/.travis.yml index fd66569..1604418 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,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 @@ -28,7 +27,7 @@ script: notifications: irc: - if: (tag OR branch = master) AND + if: (tag OR branch = "1.26") AND repo = "mate-desktop/mate-settings-daemon" channels: - "irc.libera.chat#mate-dev" @@ -39,17 +38,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 @@ -57,17 +45,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" |