LBRYFoundation/lbry-desktop
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-desktop.git synced 2025-08-23 17:47:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build on travis

Browse source
This commit is contained in:
Job Evers-Meltzer 2017-01-16 20:40:10 -06:00
parent cda5730057
commit 7b7da549a8
5 changed files with 36 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -1,3 +1,6 @@
[submodule "lbry-web-ui"] [submodule "lbry-web-ui"]
path = lbry-web-ui path = lbry-web-ui
url = https://github.com/lbryio/lbry-web-ui.git url = https://github.com/lbryio/lbry-web-ui.git
[submodule "lbry"]
path = lbry
url = https://github.com/lbryio/lbry.git

21
.travis.yml Normal file
View file

@ -0,0 +1,21 @@
matrix:
include:
- os: osx
# Use generic language for osx
# python 2.7 is broken on osx on travis, so follow we have to specify the installation ourselves
# https://github.com/travis-ci/travis-ci/issues/2312#issuecomment-195620855
language: generic
osx_image: xcode7.3
install:
- wget https://www.python.org/ftp/python/2.7.13/python-2.7.13-macosx10.6.pkg
- sudo installer -pkg python-2.7.11-macosx10.6.pkg -target /
- pip install -U pip
- pip install pyinstaller
- wget https://nodejs.org/dist/v6.9.4/node-v6.9.4.pkg
- sudo installer -pkg node-v6.9.4.pkg -target /
- npm install electron-packager -g
- ./build.sh
- electron-packager --electron-version=1.4.14 --overwrite electron LBRY

14
build.sh
View file

@ -6,8 +6,15 @@ set -eu
cd electron cd electron
npm install npm install
cd ../lbry
git fetch
git reset --hard origin/master
git cherry-pick bd75e88ebebb67897c62a1ee1d3228fd269677dc
pip install -r requirements.txt
pip install .
cd ../lbrynet cd ../lbrynet
pyinstaller lbry.py -y --windowed --onefile --icon=../../lbry/packaging/osx/lbry-osx-app/app.icns pyinstaller lbry.py -y --windowed --onefile --icon=../lbry/packaging/osx/lbry-osx-app/app.icns
cd ../lbry-web-ui cd ../lbry-web-ui
git fetch git fetch
@ -16,10 +23,9 @@ git cherry-pick 06224b1d2cf4bf1f63d95031502260dd9c3ec5c1
npm install npm install
node_modules/.bin/node-sass --output dist/css --sourcemap=none scss/ node_modules/.bin/node-sass --output dist/css --sourcemap=none scss/
webpack webpack
git reset --hard origin/master
cd ../lbry-electron/ cd ..
cp -R ../lbry-web-ui/dist electron/ cp -R lbry-web-ui/dist electron/
mv lbrynet/dist/lbry electron/dist mv lbrynet/dist/lbry electron/dist

1
lbry Submodule

@ -0,0 +1 @@
Subproject commit e889bf55a78d645795870ee9c4956a514a8dd60a

2
lbry-web-ui

@ -1 +1 @@
Subproject commit 3a8cc9e2e2e6cf81cb957689837f4f150152941e Subproject commit 52a4dd1cc9ab70b683c092946325235778be4887