From 12c9e16f37e884862f504c2ac5fffb93c0cfa6c9 Mon Sep 17 00:00:00 2001 From: Job Evers Date: Fri, 10 Jun 2016 01:22:51 -0500 Subject: [PATCH 1/2] fix typo to actually use ubuntu trusty --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 64fa247ea..83f5cf454 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ matrix: include: - os: linux sudo: required - dist: trust + dist: trusty # dh-virtualenv requires that we use the same python interpreter # that comes with the system, so we don't want to use anything that # travis would try to set-up for us in python From b57212d5f78e090c95bc4bcf3de4e713f688acba Mon Sep 17 00:00:00 2001 From: Job Evers Date: Fri, 10 Jun 2016 01:38:05 -0500 Subject: [PATCH 2/2] print package size in travis --- packaging/ubuntu/ubuntu_package_setup.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packaging/ubuntu/ubuntu_package_setup.sh b/packaging/ubuntu/ubuntu_package_setup.sh index 70cd064e4..813cd397d 100755 --- a/packaging/ubuntu/ubuntu_package_setup.sh +++ b/packaging/ubuntu/ubuntu_package_setup.sh @@ -107,7 +107,7 @@ $SUDO pip install make-deb # # dpkg-buildpackage outputs its results into '..' so # we need to move/clone lbry into the build directory -if [ "$CLONE" == true]; then +if [ "$CLONE" == true ]; then cp -a $SOURCE_DIR lbry else git clone https://github.com/lbryio/lbry.git @@ -165,6 +165,10 @@ ar r "$PACKAGE" debian-binary control.tar.gz data.tar.xz # TODO: we can append to data.tar instead of extracting it all and recompressing -if [[ -n "${TRAVIS_BUILD_DIR}" ]]; then +if [[ ! -z "${TRAVIS_BUILD_DIR+x}" ]]; then + # move it to a consistent place so that later it can be uploaded + # to the github releases page mv "${PACKAGE}" "${TRAVIS_BUILD_DIR}/${PACKAGE}" + # want to be able to check the size of the result in the log + ls -l "${TRAVIS_BUILD_DIR}/${PACKAGE}" fi