From b494c6dc8e11755920672c21a28133c3b43a6e07 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Thu, 24 Jan 2019 21:32:56 -0600 Subject: [PATCH] travis: fixes --- .travis.yml | 11 ++++++++++- build-in-docker.sh | 4 ---- start-docker.sh | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index be3fb0d..d56289c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,5 +7,14 @@ os: - linux script: - - sh build-in-docker.sh + - sh start-docker.sh +after_success: + - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh + - if [ "$TRAVIS_BRANCH" != "$TRAVIS_TAG" ] && [ "$TRAVIS_BRANCH" != "master" ]; then export TRAVIS_EVENT_TYPE=pull_request; fi + - bash upload.sh Stratus-x86_64.AppImage + +branches: + except: + - # Do not build tags that we create when we upload to GitHub Releases + - /^(?i:continuous)$/ diff --git a/build-in-docker.sh b/build-in-docker.sh index bee051c..12e3cca 100755 --- a/build-in-docker.sh +++ b/build-in-docker.sh @@ -16,8 +16,4 @@ export PATH=$PATH:$PWD/docker/nim/bin export PKG_CONFIG_PATH=/opt/qt/5.12.0/gcc_64/lib/pkgconfig export LD_LIBRARY_PATH=/opt/qt/5.12.0/gcc_64/lib/ -cd ../.. -nimble develop -cd examples/stratus - make clean appimage diff --git a/start-docker.sh b/start-docker.sh index c283b73..46cd6ca 100755 --- a/start-docker.sh +++ b/start-docker.sh @@ -1,6 +1,6 @@ docker run -it --rm --device /dev/fuse \ - -v /home/arnetheduck/status/nim-eth-p2p:/nim-eth-p2p:Z \ - -w /nim-eth-p2p/examples/stratus \ + -v $PWD:/stratus:Z \ + -w /stratus \ --cap-add SYS_ADMIN \ a12e/docker-qt:5.12-gcc_64 \ sh build-in-docker.sh