diff options
| -rw-r--r-- | .travis.yml | 33 | ||||
| -rwxr-xr-x | .travis/bitlbee.sh | 18 | ||||
| -rwxr-xr-x | .travis/obs.sh (renamed from travis.sh) | 13 |
3 files changed, 31 insertions, 33 deletions
diff --git a/.travis.yml b/.travis.yml index e8739dc..12c54bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ env: - COVERITY_SCAN_NOTIFICATION_EMAIL=nope - COVERITY_SCAN_BUILD_COMMAND=make - COVERITY_SCAN_BRANCH_PATTERN=coverity_scan + - MY_DEPLOY_BRANCH=master before_install: - echo "deb http://download.opensuse.org/repositories/openSUSE:/Tools/xUbuntu_$(lsb_release -rs) ./" @@ -27,35 +28,19 @@ before_install: - sudo apt-get update -qq - sudo apt-get install -qq --no-install-recommends - asciidoc clang libjson-glib-dev - lynx osc - xsltproc - xmlto install: - - git clone https://github.com/bitlbee/bitlbee - - cd bitlbee - - ./configure - --events=glib - --ssl=gnutls - --debug=1 - --plugins=1 - --jabber=0 - --msn=0 - --oscar=0 - --otr=0 - --purple=0 - --skype=0 - --twitter=0 - --yahoo=0 - - make - - sudo make install install-dev - - cd - - - rm -rf bitlbee + - .travis/bitlbee.sh script: - curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash || true - - ./travis.sh + - CFLAGS="-Werror" ./autogen.sh --enable-warnings + - make + - make clean + - scan-build -k --status-bugs make + +after_success: + - .travis/obs.sh diff --git a/.travis/bitlbee.sh b/.travis/bitlbee.sh new file mode 100755 index 0000000..07ec366 --- /dev/null +++ b/.travis/bitlbee.sh @@ -0,0 +1,18 @@ +#!/bin/bash +set -e + +git clone https://github.com/bitlbee/bitlbee /tmp/bitlbee +cd /tmp/bitlbee + +./configure \ + --events=glib \ + --ssl=gnutls \ + --doc=0 \ + --jabber=0 \ + --msn=0 \ + --oscar=0 \ + --twitter=0 \ + --yahoo=0 + +make +sudo make install install-dev diff --git a/travis.sh b/.travis/obs.sh index d4ba66c..34b08b9 100755 --- a/travis.sh +++ b/.travis/obs.sh @@ -1,14 +1,9 @@ #!/bin/bash -set -e - -CFLAGS="-Werror" ./autogen.sh --enable-warnings -make -make clean -scan-build -k --status-bugs make -if [ "${TRAVIS_BRANCH}" != "master" ]; then - exit -fi +[ "${TRAVIS_PULL_REQUEST}" == "false" -a \ + "${TRAVIS_BRANCH}" == "${MY_DEPLOY_BRANCH}" \ +] || exit +set -e FULLVERS="$(date +%Y%m%d)~$(git rev-parse --short=7 HEAD)~${TRAVIS_BUILD_NUMBER}" FULLDATE=$(date -R) |