diff --git a/build.sh b/build.sh index 218b3bcdb..fe4435a9f 100755 --- a/build.sh +++ b/build.sh @@ -12,6 +12,7 @@ git reset --hard origin/master git cherry-pick bd75e88ebebb67897c62a1ee1d3228fd269677dc pip install -r requirements.txt pip install . +git reset --hard origin/master cd ../lbrynet pyinstaller lbry.py -y --windowed --onefile --icon=../lbry/packaging/osx/lbry-osx-app/app.icns @@ -23,6 +24,7 @@ git cherry-pick 06224b1d2cf4bf1f63d95031502260dd9c3ec5c1 npm install node_modules/.bin/node-sass --output dist/css --sourcemap=none scss/ webpack +git reset --hard origin/master cd .. cp -R lbry-web-ui/dist electron/ diff --git a/lbry b/lbry index e889bf55a..8a026071e 160000 --- a/lbry +++ b/lbry @@ -1 +1 @@ -Subproject commit e889bf55a78d645795870ee9c4956a514a8dd60a +Subproject commit 8a026071eb1734d83c457e092b0676030026d9cd diff --git a/lbry-web-ui b/lbry-web-ui index 52a4dd1cc..b78b64482 160000 --- a/lbry-web-ui +++ b/lbry-web-ui @@ -1 +1 @@ -Subproject commit 52a4dd1cc9ab70b683c092946325235778be4887 +Subproject commit b78b644826d0077417bfa3b35dcd17db4b1faedc