From 15433df28d237cfe33fa6f15bda887131b99a0b6 Mon Sep 17 00:00:00 2001 From: fivepiece Date: Sat, 26 Aug 2017 15:36:54 +0300 Subject: [PATCH] add test result files to gitignore change .travis.yml indentation to 2 spaces (whoops) remove whitespace --- .gitignore | 11 ++++++++++- .travis.yml | 24 +++++++++--------------- install.sh | 2 +- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 8bf11e5..99aef2e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,13 @@ htmlcov/ scripts/joinmarket.cfg scripts/cmttools/commitments.json scripts/blacklist - +alicekey +alicepubkey +bobkey +commitments_debug.txt +deps/ +jmvenv/ +logs/ +miniircd/ +nums_basepoints.txt +schedulefortesting diff --git a/.travis.yml b/.travis.yml index 92f4f0d..4a2f5c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,25 +2,19 @@ sudo: required dist: trusty language: python python: - - "2.7_with_system_site_packages" - + - "2.7_with_system_site_packages" before_install: - - sudo apt-add-repository ppa:bitcoin/bitcoin -y - - sudo apt-get update -q - - sudo apt-get install --no-install-recommends --no-upgrade -qq bitcoind - + - sudo apt-add-repository ppa:bitcoin/bitcoin -y + - sudo apt-get update -q + - sudo apt-get install --no-install-recommends --no-upgrade -qq bitcoind install: - - ./install.sh - + - ./install.sh before_script: - - source jmvenv/bin/activate - + - source jmvenv/bin/activate script: - - ./test/run_tests.sh - + - ./test/run_tests.sh after_success: - - coveralls - + - coveralls branches: only: - - test_travis + - test_travis diff --git a/install.sh b/install.sh index 7570dee..ca57320 100755 --- a/install.sh +++ b/install.sh @@ -298,7 +298,7 @@ main () Before executing scripts or tests, run: \`source jmvenv/bin/activate\` - + from this directiry, to acticate virtualenv." } main