From b9f3d252fc662e3ff3a216f1ea42e0d85cd34d69 Mon Sep 17 00:00:00 2001
From: jgeboski <jgeboski@gmail.com>
Date: Sun, 20 Dec 2015 12:44:03 -0500
Subject: travis: refactored for better readability and handling

Changes made:
  - Build and install bitlbee from /tmp
  - Disabled the building of the bitlbee documentation
  - Moved all build commands to travis.yml (more informative)
  - Moved all Travis related scripts to a hidden directory
  - Moved the bitlbee build commands to a script
  - Only deploy the master branch (excluding pull requests)
  - Removed redundant parameters from the bitlbee configure command
---
 .travis.yml        | 33 +++++++++-----------------------
 .travis/bitlbee.sh | 18 ++++++++++++++++++
 .travis/obs.sh     | 50 +++++++++++++++++++++++++++++++++++++++++++++++++
 travis.sh          | 55 ------------------------------------------------------
 4 files changed, 77 insertions(+), 79 deletions(-)
 create mode 100755 .travis/bitlbee.sh
 create mode 100755 .travis/obs.sh
 delete mode 100755 travis.sh

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/obs.sh b/.travis/obs.sh
new file mode 100755
index 0000000..34b08b9
--- /dev/null
+++ b/.travis/obs.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+[ "${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)
+REPONAME=$(basename "${TRAVIS_REPO_SLUG}")
+
+git reset -q --hard
+git clean -dfqx
+
+sed -ri \
+    -e "18 s/^(\s+).*(,)\$/\1\[${FULLVERS}\]\2/" \
+    -e "s|^PKG_CHECK_MODULES\(\[BITLBEE\].*|plugindir=/usr/lib/bitlbee|" \
+    configure.ac
+sed -ri \
+    -e "s/bitlbee-dev \([^\(\)]+\),?\s*//" \
+    debian/control
+
+cat <<EOF > debian/changelog
+${REPONAME} (${FULLVERS}) UNRELEASED; urgency=medium
+
+  * Updated to ${FULLVERS}.
+
+ -- Travis CI <travis@travis-ci.org>  ${FULLDATE}
+EOF
+
+cat <<EOF > ~/.oscrc
+[general]
+apiurl = https://api.opensuse.org
+[https://api.opensuse.org]
+user = ${OBSUSER}
+pass = ${OBSPASS}
+EOF
+
+mkdir -p m4
+cp /usr/local/include/bitlbee/*.h facebook
+osc checkout "home:${OBSUSER}" "${REPONAME}" -o /tmp/obs
+
+(
+    cd /tmp/obs
+    rm -f *.{dsc,tar.gz}
+    dpkg-source -I -b "${TRAVIS_BUILD_DIR}"
+
+    osc addremove -r
+    osc commit -m "Updated to ${FULLVERS}"
+)
diff --git a/travis.sh b/travis.sh
deleted file mode 100755
index d4ba66c..0000000
--- a/travis.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/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
-
-FULLVERS="$(date +%Y%m%d)~$(git rev-parse --short=7 HEAD)~${TRAVIS_BUILD_NUMBER}"
-FULLDATE=$(date -R)
-REPONAME=$(basename "${TRAVIS_REPO_SLUG}")
-
-git reset -q --hard
-git clean -dfqx
-
-sed -ri \
-    -e "18 s/^(\s+).*(,)\$/\1\[${FULLVERS}\]\2/" \
-    -e "s|^PKG_CHECK_MODULES\(\[BITLBEE\].*|plugindir=/usr/lib/bitlbee|" \
-    configure.ac
-sed -ri \
-    -e "s/bitlbee-dev \([^\(\)]+\),?\s*//" \
-    debian/control
-
-cat <<EOF > debian/changelog
-${REPONAME} (${FULLVERS}) UNRELEASED; urgency=medium
-
-  * Updated to ${FULLVERS}.
-
- -- Travis CI <travis@travis-ci.org>  ${FULLDATE}
-EOF
-
-cat <<EOF > ~/.oscrc
-[general]
-apiurl = https://api.opensuse.org
-[https://api.opensuse.org]
-user = ${OBSUSER}
-pass = ${OBSPASS}
-EOF
-
-mkdir -p m4
-cp /usr/local/include/bitlbee/*.h facebook
-osc checkout "home:${OBSUSER}" "${REPONAME}" -o /tmp/obs
-
-(
-    cd /tmp/obs
-    rm -f *.{dsc,tar.gz}
-    dpkg-source -I -b "${TRAVIS_BUILD_DIR}"
-
-    osc addremove -r
-    osc commit -m "Updated to ${FULLVERS}"
-)
-- 
cgit v1.2.3