Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit 1d0efba

Browse files
committed
Fix releases
On all branches Add chmod Quiet the build Updates for Linux 64-bit Update english.txt location Fix
1 parent 41d6821 commit 1d0efba

3 files changed

Lines changed: 29 additions & 29 deletions

File tree

.travis.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,27 @@ install:
1010
- pip install -r test_requirements.txt
1111

1212
script:
13+
- pip install -q pyinstaller==3.1
14+
- pip install -q setuptools==19.2
15+
- pyinstaller -D -F .travis/openbazaard.linux64.spec
1316
- "docker run -i -v \"${PWD}:/OpenBazaar\" toopher/ubuntu-i386:14.04 /bin/bash -c \"linux32 --32bit i386 /OpenBazaar/build.sh\""
1417
- sudo bash build-win.sh
1518
- sudo bash build-win64.sh
16-
19+
- sudo chmod 777 dist/openbazaard-linux32
20+
- sudo chmod a+x dist/openbazaard-linux32
21+
- sudo chmod a+x dist/openbazaard-linux64
22+
- sudo chmod 777 dist/openbazaard-linux64
23+
- sudo chmod 777 dist/openbazaard.exe
1724
after_success:
1825
- coveralls
1926
deploy:
2027
provider: releases
2128
api_key: "$GITHUB_TOKEN"
2229
file:
23-
- "dist/linux32/openbazaard-linux32"
30+
- "dist/openbazaard-linux32"
31+
- "dist/openbazaard-linux64"
32+
- "dist/openbazaard.exe"
33+
- "ob.cfg"
2434
skip_cleanup: true
35+
on:
36+
all_branches: true

.travis/openbazaard.linux64.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ a = Analysis(['../openbazaard.py'],
1616
cipher=block_cipher)
1717
pyz = PYZ(a.pure, a.zipped_data,
1818
cipher=block_cipher)
19-
a.datas += [('../ob.cfg', 'ob.cfg', 'DATA'),('./bitcointools/english.txt','virt/bitcointools/english.txt','DATA')]
19+
a.datas += [('../ob.cfg', 'ob.cfg', 'DATA'),('./bitcointools/english.txt','/home/travis/virtualenv/python2.7.10/lib/python2.7/site-packages/bitcointools/english.txt','DATA')]
2020
pyz = PYZ(a.pure, a.zipped_data,
2121
cipher=block_cipher)
2222
exe = EXE(pyz,

build.sh

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,50 +7,38 @@ mkdir dist
77

88
# case "$TRAVIS_OS_NAME" in
99
# "linux")
10+
11+
1012
cd OpenBazaar/
1113

1214
echo "Building Linux Binaries...."
13-
sudo apt-get -y update
15+
sudo apt-get -qq update
16+
sudo apt-get install -qq -y wget
1417

15-
sudo apt-get install -y wget
1618
echo "32-bit..."
1719

18-
wget https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tgz
19-
tar xzf Python-2.7.11.tgz
20-
sudo apt-get -y install gcc-multilib g++-multilib
20+
wget -q https://www.python.org/ftp/python/2.7.10/Python-2.7.10.tgz
21+
tar xzf Python-2.7.10.tgz
22+
sudo apt-get -qq -y install gcc-multilib g++-multilib
2123
CFLAGS=-m32 LDFLAGS=-m32 ./configure --prefix=/opt/Python2.7-32bits
2224
make
2325
make install
2426

25-
# mkdir dist/linux32
26-
# cd dist/linux32
27-
2827
echo "Installing APT packages"
29-
sudo apt-get -y install npm python-pip python-virtualenv python-dev libffi-dev
28+
sudo apt-get -y -qq install npm python-pip python-virtualenv python-dev libffi-dev
3029

3130
echo "Set up virtualenv"
3231
virtualenv virt
3332
. virt/bin/activate
34-
ls env/bin/
33+
3534
echo "Install Python dependencies"
36-
virt/bin/pip install -r requirements.txt
37-
virt/bin/pip install pyinstaller==3.1
38-
virt/bin/pip install cryptography
39-
virt/bin/pip install setuptools==19.2
35+
virt/bin/pip install -q -r requirements.txt
36+
virt/bin/pip install -q pyinstaller==3.1
37+
virt/bin/pip install -q cryptography
38+
virt/bin/pip install -q setuptools==19.2
4039
virt/bin/pyinstaller -D -F .travis/openbazaard.linux32.spec
4140

42-
# echo "64-bit"
43-
#
44-
# mkdir dist/linux64
45-
# cd dist/linux64
46-
#
47-
# echo "Set up virtualenv"
48-
# virtualenv env
49-
# . env/bin/activate
50-
#
51-
# echo "Install Python dependencies"
52-
# pyinstaller -D -F ../../.travis/openbazaard.linux64.spec
53-
41+
5442
# ;;
5543
#
5644
# "osx")

0 commit comments

Comments
 (0)