diff options
| author | Pablo Barciela <[email protected]> | 2020-03-17 02:36:54 +0100 |
|---|---|---|
| committer | Pablo Barciela <[email protected]> | 2020-03-17 03:03:57 +0100 |
| commit | 7e924d303cfaf17f0b3ecc41eb4a8f2344eb57ab (patch) | |
| tree | 6d92cd9847a72c67a670d988e0e4818546738ef3 | |
| parent | bc2e7d5cc0f0e96944792914f11c0faebdb1fe67 (diff) | |
| download | mate-desktop-7e924d303cfaf17f0b3ecc41eb4a8f2344eb57ab.tar.bz2 mate-desktop-7e924d303cfaf17f0b3ecc41eb4a8f2344eb57ab.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
@@ -48,7 +48,6 @@ requires: - cairo-gobject-devel - clang-analyzer - clang - - cppcheck-htmlreport - dconf-devel - desktop-file-utils - gcc @@ -105,11 +104,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 --prefix=/usr --enable-gtk-doc - if [ $CPU_COUNT -gt 1 ]; then @@ -123,11 +117,6 @@ build_scripts: after_scripts: - if [ ${BUILD_TYPE} == "scripts" ];then - - 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}/${REPO_NAME}/raw/master/icons/16x16/apps/mate-desktop.png - - fi - make distcheck - fi @@ -143,4 +132,3 @@ releases: base_version: 1.20.0 notify_servers: - https://release.mate-desktop.org/release - diff --git a/.travis.yml b/.travis.yml index 48f7862..e45f164 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 --build meson 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" - |