[beast] TRAVIS: distinguish INTENT=package and INTENT=distcheck



commit 35d0030708aad3748ae03cb0101f1ca5c20a4103
Author: Tim Janik <timj gnu org>
Date:   Thu Apr 7 19:43:03 2016 +0200

    TRAVIS: distinguish INTENT=package and INTENT=distcheck
    
    Signed-off-by: Tim Janik <timj gnu org>

 .travis.docker |    4 ++--
 .travis.yml    |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/.travis.docker b/.travis.docker
index 17fd251..5fd47a0 100644
--- a/.travis.docker
+++ b/.travis.docker
@@ -69,7 +69,7 @@ WORKDIR /usr/src/
 # update 'changelog', install dependencies, build debian packages.
 ENV DISTRELEASE "@DISTRELEASE@"
 ENV TRAVIS_JOB_NUMBER "@TRAVIS_JOB_NUMBER@"
-RUN [ $INTENT = deb ] || exit 0 && \
+RUN [ $INTENT = package ] || exit 0 && \
     eval `beast/buildtool.sh config` && \
     DIST_TARBALL="$PACKAGE/$PACKAGE-$UPSVERSION.tar.xz" && \
     DEB_TARBALL="$PACKAGE"_"${DEBVERSION%-*}.orig.tar.xz" && \
@@ -81,7 +81,7 @@ RUN [ $INTENT = deb ] || exit 0 && \
     cd .. && ls -al
 
 # Test package installation and removal locally
-RUN [ $INTENT = deb ] || exit 0 && \
+RUN [ $INTENT = package ] || exit 0 && \
     dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz && \
     echo 'deb [trusted=yes] file:///usr/src ./' > /etc/apt/sources.list.d/usrsrc.list && \
     retry apt-get update && apt-get install -y beast libbse-dev && \
diff --git a/.travis.yml b/.travis.yml
index a8ea59b..14ee953 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,9 @@ language: c
 env:
   global:
     #- http_proxy="http://example.com";
-    - INTENT="deb" # default intent
+    - INTENT="package" # default intent
   matrix:
-    # deb: build packages for distribution $DIST
+    # package: build packages for distribution $DIST
     - DIST="ubuntu:wily"
     - DIST="debian:jessie"
     - DIST="debian:testing"
@@ -52,10 +52,10 @@ install:
 
 script:
   # Upload packages
-  - ([ $INTENT = deb ] || exit 0 && docker run -ti --rm beast /bin/bash -c \
+  - ([ $INTENT = package ] || exit 0 && docker run -ti --rm beast /bin/bash -c \
       "export BINTRAY_APITOKEN=$BINTRAY_APITOKEN && ls -al && beast/buildtool.sh bintrayup beast-team 
deb/beast $DISTRELEASE *.deb")
   # Test package installation from remote location
-  - ([ $INTENT = deb ] || exit 0 && sleep 60 && travis_retry docker run -ti --rm beast /bin/bash -c \
+  - ([ $INTENT = package ] || exit 0 && sleep 60 && travis_retry docker run -ti --rm beast /bin/bash -c \
         "set -x && retry apt-get update && retry apt-get -y install beast libbse-dev")
   - docker ps -a
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]