diff options
| author | Pablo Barciela <[email protected]> | 2020-03-18 22:37:29 +0100 |
|---|---|---|
| committer | Pablo Barciela <[email protected]> | 2020-03-18 22:48:28 +0100 |
| commit | 54ac1a47cc166ca8194a8c206bddff80f1d89a7e (patch) | |
| tree | 8e2de7ef4a6aa679c7d5b221ccbd3ccb78f13cc1 | |
| parent | 2042e888276b78b17903b6df4af2eb05db534733 (diff) | |
| download | mate-menus-54ac1a47cc166ca8194a8c206bddff80f1d89a7e.tar.bz2 mate-menus-54ac1a47cc166ca8194a8c206bddff80f1d89a7e.tar.xz | |
Travis CI: don't update gh-pages
| -rw-r--r-- | .build.yml | 12 | ||||
| -rw-r--r-- | .travis.yml | 29 |
2 files changed, 1 insertions, 40 deletions
@@ -34,7 +34,6 @@ requires: # Useful URL: https://src.fedoraproject.org/cgit/rpms/mate-menus.git - clang - clang-analyzer - - cppcheck-htmlreport - chrpath - gcc - git @@ -75,11 +74,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 - scan-build $CHECKERS ./configure - if [ $CPU_COUNT -gt 1 ]; then @@ -92,11 +86,6 @@ build_scripts: - fi after_scripts: - - if [ ${DISTRO_NAME} == "fedora" ];then - - cppcheck --xml --output-file=cppcheck.xml --enable=warning,style,performance,portability,information,missingInclude -D'MATEMENU_I_KNOW_THIS_IS_UNSTABLE' -D'G_ENABLE_DEBUG' . - - cppcheck-htmlreport --title=${REPO_NAME} --file=cppcheck.xml --report-dir=cppcheck-htmlreport - - ./gen-index -l 20 - - fi - make distcheck releases: @@ -111,4 +100,3 @@ releases: base_version: 1.20.0 notify_servers: - https://release.mate-desktop.org/release - diff --git a/.travis.yml b/.travis.yml index 22bd2b3..74c785b 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" - |