]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
travis: move install script to .travis-functions.sh
authorRuediger Meier <ruediger.meier@ga-group.nl>
Mon, 16 Mar 2015 10:21:49 +0000 (11:21 +0100)
committerRuediger Meier <ruediger.meier@ga-group.nl>
Mon, 16 Mar 2015 13:32:34 +0000 (14:32 +0100)
Now this snippet can be re-used by non-travis systems. For example
on drone.io we can use this simple build script:
......
MAKE_CHECK="root"
source ./.travis-functions.sh
travis_install_script || exit
travis_before_script || exit
ret=0
travis_script || ret=$?
travis_after_script
exit $ret
......

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
.travis-functions.sh
.travis.yml

index ed491f4177a88484bb9243e1507ad82d39eb265e..ee4988d9e078cc68e4ed2689d2d1950572cef9c0 100755 (executable)
@@ -69,6 +69,21 @@ function check_dist
        $MAKE distcheck || return
 }
 
+function travis_install_script
+{
+       # install some packages from Ubuntu's default sources
+       sudo apt-get -qq update || return
+       sudo apt-get install -qq >/dev/null \
+               bc \
+               dnsutils \
+               libcap-ng-dev \
+               libpam-dev \
+               libudev-dev \
+               gtk-doc-tools \
+               ntp \
+               || return
+}
+
 function travis_before_script
 {
        pushd "$SOURCE_DIR" || return
index d8cbcc4e02defbed20c0c0385ca47a7da2cb2a0d..931775510ff9869cdeb37bf1fff82b031c555c04 100644 (file)
@@ -18,19 +18,10 @@ branches:
     - /^stable.*/
 
 install:
-  # install some packages from Ubuntu's default sources
-  - sudo apt-get -qq update
-  - sudo apt-get install -qq
-    bc
-    dnsutils
-    libcap-ng-dev
-    libpam-dev
-    libudev-dev
-    gtk-doc-tools
-    ntp
+  - source ./.travis-functions.sh
+  - travis_install_script
 
 before_script:
-  - source ./.travis-functions.sh
   - travis_before_script
 
 script: