From b0350830af69c6c23b8e71419672cf1a80361311 Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Fri, 20 Mar 2020 17:17:24 +0100 Subject: Travis CI: don't update gh-pages --- .build.yml | 11 ----------- .travis.yml | 28 +--------------------------- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/.build.yml b/.build.yml index 16a9ddcf..31d265d0 100644 --- a/.build.yml +++ b/.build.yml @@ -63,7 +63,6 @@ requires: - autoconf-archive - clang-analyzer - clang - - cppcheck-htmlreport - desktop-file-utils - gcc - git @@ -135,11 +134,6 @@ variables: -enable-checker security.insecureAPI.strcpy"' build_scripts: -# build failed with f30 und using clang patch, fixed in f30? -# - if [ ${DISTRO_NAME} == "fedora" ];then -# - curl -Ls -o fedora.sh https://github.com/mate-desktop/mate-dev-scripts/raw/master/travis/fedora.sh -# - bash ./fedora.sh -# - fi - ./autogen.sh --enable-compile-warnings=maximum - scan-build $CHECKERS ./configure --enable-compile-warnings=maximum - if [ $CPU_COUNT -gt 1 ]; then @@ -174,11 +168,6 @@ before_scripts: - ninja -C _build install after_scripts: - - if [ ${DISTRO_NAME} == "fedora" ];then - - cppcheck --xml --output-file=cppcheck.xml --enable=warning,style,performance,portability,information,missingInclude -i'mate-menus-build' -i'gtk-layer-shell-build' . - - cppcheck-htmlreport --title=${REPO_NAME} --file=cppcheck.xml --report-dir=cppcheck-htmlreport - - ./gen-index -l 20 -i https://raw.githubusercontent.com/${OWNER_NAME}/${REPO_NAME}/master/icons/16x16/${REPO_NAME}.png - - fi - make distcheck releases: diff --git a/.travis.yml b/.travis.yml index cc689bec..74c785b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,9 @@ language: bash services: - docker -branches: - except: - - gh-pages - 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: - sudo apt-get install -y python3-pip python3-setuptools @@ -24,16 +19,6 @@ script: - ./docker-build --name ${DISTRO} --verbose --config .build.yml --build scripts deploy: - - provider: pages - github-token: $GITHUB_TOKEN - #keep-history: true - skip_cleanup: true - committer-from-gh: true - target-branch: gh-pages - local-dir: html-report - on: - all_branches: true - condition: ${DISTRO} =~ ^fedora.*$ - provider: script script: ./docker-build --verbose --config .build.yml --release github skip_cleanup: true @@ -41,17 +26,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/base" - DISTRO="debian:testing" -- cgit v1.2.1