[beast] TRAVIS: use different bintray repositories for stable vs devel packages
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast] TRAVIS: use different bintray repositories for stable vs devel packages
- Date: Thu, 7 Apr 2016 20:21:41 +0000 (UTC)
commit 4d985390e04a6f4ef59099d4458cadc788cf2a5b
Author: Tim Janik <timj gnu org>
Date: Thu Apr 7 20:01:11 2016 +0200
TRAVIS: use different bintray repositories for stable vs devel packages
Signed-off-by: Tim Janik <timj gnu org>
.travis.yml | 9 +++++----
buildtool.sh | 12 ++++++++++++
2 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/.travis.yml b/.travis.yml
index 015abc4..4f7871a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,10 +31,11 @@ matrix:
before_install:
# buildtool.sh requires complete history for monotonic revisioning
- travis_retry git fetch --unshallow
- # Build variable setup; example: DIST=debian:jessie DISTNAME=debian DISTRELEASE=jessie
+ # Build variable setup; example: DIST=debian:jessie DISTNAME=debian DISTRELEASE=jessie BTREPO=devel
+ # Uses `buildtool.sh` to determine the version dependent bintray repository name
- true &&
- export DISTNAME="${DIST%:*}" DISTRELEASE="${DIST#*:}" &&
- export BEASTAPTSOURCE="deb [trusted=yes] https://dl.bintray.com/beast-team/deb $DISTRELEASE main" &&
+ export DISTNAME="${DIST%:*}" DISTRELEASE="${DIST#*:}" BTREPO="`./buildtool.sh ifdevel devel deb`" &&
+ export BEASTAPTSOURCE="deb [trusted=yes] https://dl.bintray.com/beast-team/$BTREPO $DISTRELEASE main" &&
echo "INTENT=$INTENT DIST=$DIST DISTNAME=$DISTNAME DISTRELEASE=$DISTRELEASE
BEASTAPTSOURCE='$BEASTAPTSOURCE'"
# Sample environment
- uname -a
@@ -54,7 +55,7 @@ install:
script:
# Upload packages
- ([ $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")
+ "export BINTRAY_APITOKEN=$BINTRAY_APITOKEN && ls -al && beast/buildtool.sh bintrayup beast-team
$BTREPO/beast $DISTRELEASE *.deb")
# Test package installation from remote location
- ([ $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")
diff --git a/buildtool.sh b/buildtool.sh
index 4f48027..1df7604 100755
--- a/buildtool.sh
+++ b/buildtool.sh
@@ -68,6 +68,17 @@ mkconfig() # print shell variables describing package, version, commit id, monot
popd >/dev/null # cd OLDPWD
}
+# == ifdevel ==
+ifdevel() # Usage: ifdevel <develvalue> [alternative]
+{
+ mkconfig >/dev/null # PACKAGE, UPSVERSION, DEVELOPMENT, ...
+ if $DEVELOPMENT ; then
+ echo "$1"
+ else
+ echo "$2"
+ fi
+}
+
# == bintrayup ==
bintrayup() # Usage: bintrayup <bintrayaccount> <packagepath> <packagedistribution> [packages...]
{
@@ -126,5 +137,6 @@ applyenv() # Usage: applyenv <inputfile> [inputargs...]
# == commands ==
[[ "$1" != config ]] || { shift; mkconfig "$@" ; exit $? ; }
+[[ "$1" != ifdevel ]] || { shift; ifdevel "$@" ; exit $? ; }
[[ "$1" != bintrayup ]] || { shift; bintrayup "$@" ; exit $? ; }
[[ "$1" != applyenv ]] || { shift; applyenv "$@" ; exit $? ; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]