summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2021-09-17 15:48:26 +0200
committerraveit65 <[email protected]>2021-09-17 15:48:26 +0200
commitfd6d44bb55aaeeae38d158adf7ce3f36dbb229be (patch)
tree1f52974ba4e90acdd4168408dfd70adcd3f73aef
parent0af945327055978ec62cf59d98b1c54a1727fef5 (diff)
downloadmate-utils-1.26.tar.bz2
mate-utils-1.26.tar.xz
branch 1.261.26
-rw-r--r--.build.yml24
-rw-r--r--.travis.yml27
2 files changed, 6 insertions, 45 deletions
diff --git a/.build.yml b/.build.yml
index 5c1cf59d..2ff2b403 100644
--- a/.build.yml
+++ b/.build.yml
@@ -52,7 +52,6 @@ requires:
- autoconf-archive
- clang
- clang-analyzer
- - cppcheck-htmlreport
- desktop-file-utils
- e2fsprogs-devel
- gcc
@@ -120,33 +119,18 @@ before_scripts:
- sed -i s/"IGNORE_HELP_LINGUAS ="/"IGNORE_HELP_LINGUAS = pt"/g gsearchtool/help/Makefile.am
build_scripts:
- - if [ ${DISTRO_NAME} == "debian" ];then
- - export CFLAGS+=" -Wsign-compare -Wunused-parameter"
- - cppcheck --enable=warning,style,performance,portability,information,missingInclude .
- - fi
-
- NOCONFIGURE=1 ./autogen.sh
- - scan-build $CHECKERS ./configure --enable-compile-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 .
+ - fi
after_scripts:
- - if [ ${DISTRO_NAME} == "fedora" ];then
- - cppcheck --xml --output-file=cppcheck.xml --enable=warning,style,performance,portability,information,missingInclude .
- - cppcheck-htmlreport --title=${REPO_NAME} --file=cppcheck.xml --report-dir=cppcheck-htmlreport
- - ./gen-index -l 20
- - fi
- make distcheck
releases:
diff --git a/.travis.yml b/.travis.yml
index 600b2f07..14ff4120 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-utils"
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"