electrum

commit 10057b18de218e7c6328324ccc09376f94441355
parent 83f2dc44dedea15199e2ef8dad27831955e27e91
Author: Johann Bauer <bauerj@bauerj.eu>
Date:   Fri,  2 Mar 2018 20:08:30 +0100

Cache dependencies for Travis build

Also: * Move temporary directory to /tmp
      * Remove files with wrong hash (so we don't have to remove them manually)

Diffstat:
M
.travis.yml
 | 
5
++++-
M
contrib/build-wine/prepare-wine.sh
 | 
11
+++++------

2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,9 @@ python:
 install:
   - pip install -r contrib/requirements/requirements-travis.txt
 cache:
-  - pip
+  - pip: true
+  - directories:
+    - /tmp/electrum-build
 script:
     - tox
 after_success:
@@ -24,5 +26,6 @@ jobs:
         - sudo apt-add-repository https://dl.winehq.org/wine-builds/ubuntu/
         - sudo apt-get update -qq
         - sudo apt-get install -qq winehq-stable dirmngr gnupg2 p7zip-full
+      before_script: ls -lah /tmp/electrum-build
       script: ./contrib/build-wine/build.sh
       after_success: true
diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh
@@ -42,6 +42,7 @@ verify_hash() {
         return 0
     else
         echo "$file $actual_hash (unexpected hash)" >&2
+        rm "$file"
         exit 1
     fi
 }
@@ -54,7 +55,7 @@ download_if_not_exist() {
 }
 
 # Let's begin!
-cd `dirname $0`
+here=$(dirname $(readlink -e $0))
 set -e
 
 # Clean up Wine environment
@@ -64,11 +65,9 @@ echo "done"
 
 wine 'wineboot'
 
-echo "Cleaning tmp"
-mkdir -p tmp
-echo "done"
+mkdir -p /tmp/electrum-build
 
-cd tmp
+cd /tmp/electrum-build
 
 # Install Python
 # note: you might need "sudo apt-get install dirmngr" for the following
@@ -94,7 +93,7 @@ $PYTHON -m pip install pywin32-ctypes==0.1.2
 # install PySocks
 $PYTHON -m pip install win_inet_pton==1.0.1
 
-$PYTHON -m pip install -r ../../deterministic-build/requirements-binaries.txt
+$PYTHON -m pip install -r $here/../deterministic-build/requirements-binaries.txt
 
 # Install PyInstaller
 $PYTHON -m pip install https://github.com/ecdsa/pyinstaller/archive/fix_2952.zip