[beast] TRAVIS: simplify bintray package installations
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast] TRAVIS: simplify bintray package installations
- Date: Fri, 1 Apr 2016 17:46:03 +0000 (UTC)
commit 6077171beef625109441e51f7883f0563f9e60a4
Author: Tim Janik <timj gnu org>
Date: Fri Apr 1 11:13:17 2016 +0200
TRAVIS: simplify bintray package installations
Signed-off-by: Tim Janik <timj gnu org>
.travis.docker | 10 +++-------
.travis.yml | 4 +---
2 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/.travis.docker b/.travis.docker
index f086574..93632ff 100644
--- a/.travis.docker
+++ b/.travis.docker
@@ -28,13 +28,9 @@ RUN retry apt-get update && retry apt-get -y install apt-utils && retry apt-get
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 379CE192D401AB61
# Install Rapicorn packages
-RUN echo 'deb [trusted=yes] @BINTRAYREPO@' | \
- tee /etc/apt/sources.list.d/bintray-beast-team.list && \
- retry apt-get -y install apt-transport-https ca-certificates && \
- retry apt-get update && retry apt-get -y install rapicorn && \
- sed 's/^/#/' -i /etc/apt/sources.list.d/bintray-beast-team.list && \
- apt-get -y purge apt-transport-https ca-certificates && \
- apt-get -y --purge autoremove
+RUN retry apt-get -y install apt-transport-https ca-certificates && \
+ echo "$BINTRAYREPO" | tee /etc/apt/sources.list.d/bintray-beast-team.list && \
+ retry apt-get update && retry apt-get -y install rapicorn
# Provide build essentials and dependencies
RUN retry apt-get install -y \
diff --git a/.travis.yml b/.travis.yml
index 73adcc2..e4b30c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,9 +56,7 @@ script:
"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 \
- "set -x && retry apt-get -y install apt-transport-https ca-certificates &&
- echo '$BINTRAYREPO' | tee /etc/apt/sources.list.d/bintray-beast-team.list &&
- retry apt-get update && retry apt-get -y install beast libbse-dev")
+ "set -x && retry apt-get update && retry apt-get -y install beast libbse-dev")
- docker ps -a
after_success:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]