diff options
author | Pablo Barciela <[email protected]> | 2020-03-10 15:00:23 +0100 |
---|---|---|
committer | Pablo Barciela <[email protected]> | 2020-03-10 15:38:14 +0100 |
commit | 617d7bc66254a5045e0f421f74e3f66200b91ca3 (patch) | |
tree | 07995a47176e3b8340758c0c07bd6f2e802a6638 | |
parent | 10fe0da1627212ff12a527cf4ab831014343bab7 (diff) | |
download | caja-617d7bc66254a5045e0f421f74e3f66200b91ca3.tar.bz2 caja-617d7bc66254a5045e0f421f74e3f66200b91ca3.tar.xz |
Travis CI: don't update gh-pages
-rw-r--r-- | .build.yml | 11 | ||||
-rw-r--r-- | .travis.yml | 29 |
2 files changed, 1 insertions, 39 deletions
@@ -55,7 +55,6 @@ requires: # Useful URL: https://src.fedoraproject.org/cgit/rpms/caja.git/ - clang-analyzer - clang - - cppcheck-htmlreport - git - gcc - make @@ -131,11 +130,6 @@ before_scripts: - chmod +x /usr/bin/gla11y 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-empty-view - scan-build $CHECKERS ./configure --enable-empty-view - if [ $CPU_COUNT -gt 1 ]; then @@ -148,11 +142,6 @@ build_scripts: - 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 -i https://github.com/${OWNER_NAME}/mate-icon-theme/raw/master/mate/16x16/apps/system-file-manager.png - - fi - make distcheck releases: 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" - |