diff options
| -rw-r--r-- | .build.yml | 7 | ||||
| -rw-r--r-- | .travis.yml | 29 | 
2 files changed, 1 insertions, 35 deletions
| @@ -36,7 +36,6 @@ requires:      # Useful URL: https://src.fedoraproject.org/cgit/rpms/mate-calc.git      - clang      - clang-analyzer -    - cppcheck-htmlreport      - bison      - desktop-file-utils      - flex @@ -100,11 +99,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/accessories-calculator.png -  - fi    - make distcheck  releases: @@ -119,4 +113,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" - | 
