summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2020-03-18 22:09:27 +0100
committerPablo Barciela <[email protected]>2020-03-18 22:45:19 +0100
commit2f1c5a7c08d3cfc3e837b20cb37bd192933a88ae (patch)
tree8b35137b71cd44f7ed38eed6912aa970052efe54
parentbe66a210248bb8ec468e02801d639948323cc448 (diff)
downloadmate-media-2f1c5a7c08d3cfc3e837b20cb37bd192933a88ae.tar.bz2
mate-media-2f1c5a7c08d3cfc3e837b20cb37bd192933a88ae.tar.xz
Travis CI: don't update gh-pages
-rw-r--r--.build.yml12
-rw-r--r--.travis.yml29
2 files changed, 1 insertions, 40 deletions
diff --git a/.build.yml b/.build.yml
index 94c0eb0..5faef11 100644
--- a/.build.yml
+++ b/.build.yml
@@ -41,7 +41,6 @@ requires:
- autoconf-archive
- clang
- clang-analyzer
- - cppcheck-htmlreport
- gcc
- desktop-file-utils
- git
@@ -103,11 +102,6 @@ build_scripts:
- fi
before_scripts:
- ## Debian - patch intltool-update
- #- if [ ${DISTRO_NAME} == "debian" ];then
- #- curl -Ls -o debian.sh https://github.com/mate-desktop/mate-dev-scripts/raw/master/travis/debian.sh
- #- bash ./debian.sh
- #- fi
# Install mate-common fron tarball
- cd ${START_DIR}
- '[ -f mate-common-1.23.3.tar.xz ] || curl -Ls -o mate-common-1.23.3.tar.xz http://pub.mate-desktop.org/releases/1.23/mate-common-1.23.3.tar.xz'
@@ -122,11 +116,6 @@ before_scripts:
- make install
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-media/raw/master/data/icons/16x16/status/audio-input-microphone-high.png
- - fi
- make distcheck
releases:
@@ -141,4 +130,3 @@ releases:
base_version: 1.20.0
notify_servers:
- https://release.mate-desktop.org/release
-
diff --git a/.travis.yml b/.travis.yml
index 68a9378..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
@@ -23,28 +18,7 @@ install:
script:
- ./docker-build --name ${DISTRO} --verbose --config .build.yml --build scripts
-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'
-
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
@@ -57,4 +31,3 @@ env:
- DISTRO="debian:testing"
- DISTRO="fedora:latest"
- DISTRO="ubuntu:19.10"
-