diff options
| author | Pablo Barciela <[email protected]> | 2020-03-13 17:13:44 +0100 |
|---|---|---|
| committer | Pablo Barciela <[email protected]> | 2020-03-13 17:49:54 +0100 |
| commit | 4d88801351499afa4e53cc76cbc39d22dfa2536b (patch) | |
| tree | 7c4824fd7eaf45b5ee9ecff6a6814230c1478173 | |
| parent | ccec75848c855d3e7d24965b11f28dbc988964e4 (diff) | |
| download | marco-4d88801351499afa4e53cc76cbc39d22dfa2536b.tar.bz2 marco-4d88801351499afa4e53cc76cbc39d22dfa2536b.tar.xz | |
Travis CI: don't update gh-pages
| -rw-r--r-- | .build.yml | 7 | ||||
| -rw-r--r-- | .travis.yml | 29 |
2 files changed, 1 insertions, 35 deletions
@@ -62,7 +62,6 @@ requires: - autoconf-archive - clang-analyzer - clang - - cppcheck-htmlreport - desktop-file-utils - gcc - git @@ -158,11 +157,6 @@ build_scripts: - fi after_scripts: - - if [ ${DISTRO_NAME} == "fedora" ];then - - cppcheck --xml --output-file=cppcheck.xml --enable=warning,style,performance,portability,information,missingInclude --force -D'PACKAGE' -D'WITH_VERBOSE_MODE' . - - cppcheck-htmlreport --title=${REPO_NAME} --file=cppcheck.xml --report-dir=cppcheck-htmlreport - - ./gen-index -l 20 -i https://github.com/${OWNER_NAME}/mate-icon-theme/raw/master/mate/16x16/apps/preferences-system-windows.png - - fi - make distcheck releases: @@ -177,4 +171,3 @@ releases: base_version: 1.20.0 notify_servers: - https://release.mate-desktop.org/release - diff --git a/.travis.yml b/.travis.yml index 8790eedb..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,20 +26,8 @@ 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" - DISTRO="fedora:latest" - DISTRO="ubuntu:19.10" - |