Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

add ui bundle to RC too

Browse source
This commit is contained in:
Job Evers-Meltzer 2016-11-11 09:49:27 -06:00
parent c407d32f5d
commit 23c012f417
3 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -27,7 +27,7 @@ cache:
before_install: before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./packaging/travis/setup_osx.sh; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./packaging/travis/setup_osx.sh; fi
- mkdir -p lbrynet/resources/ui - mkdir -p lbrynet/resources/ui
- if [[ -z "$TRAVIS_TAG" ]]; then ./packaging/travis/setup_qa.sh; fi - ./packaging/travis/setup_qa.sh
install: install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./packaging/travis/install_dependencies_and_run_tests.sh; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./packaging/travis/install_dependencies_and_run_tests.sh; fi

19
packaging/travis/setup_qa.sh
View file

@ -6,10 +6,19 @@
set -euo pipefail set -euo pipefail
set -o xtrace set -o xtrace
# changes to this script also need to be added to build.ps1 for windows
add_ui() {
wget https://s3.amazonaws.com/lbry-ui/development/dist.zip -O dist.zip
unzip -oq dist.zip -d lbrynet/resources/ui
wget https://s3.amazonaws.com/lbry-ui/development/data.json -O lbrynet/resources/ui/data.json
}
# changes here also need to be added to build.ps1 for windows IS_RC_REGEX="v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+-rc[[:digit:]]+"
python packaging/append_sha_to_version.py lbrynet/__init__.py ${TRAVIS_COMMIT}
wget https://s3.amazonaws.com/lbry-ui/development/dist.zip -O dist.zip if [[ -z "$TRAVIS_TAG" ]]; then
unzip -oq dist.zip -d lbrynet/resources/ui python packaging/append_sha_to_version.py lbrynet/__init__.py "${TRAVIS_COMMIT}"
wget https://s3.amazonaws.com/lbry-ui/development/data.json -O lbrynet/resources/ui/data.json add_ui
elif [[ "$TRAVIS_TAG" =~ $IS_RC_REGEX ]]; then
# If the tag looks like v0.7.6-rc0 then this is a tagged release candidate.
add_ui
fi

23
packaging/windows/build.ps1
View file

@ -1,13 +1,24 @@
# this is a port of setup_qa.sh used for the unix platforms # this is a port of setup_qa.sh used for the unix platforms
function AddUi {
wget https://s3.amazonaws.com/lbry-ui/development/dist.zip -OutFile dist.zip
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
Expand-Archive dist.zip -dest lbrynet\resources\ui
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
wget https://s3.amazonaws.com/lbry-ui/development/data.json -OutFile lbrynet\resources\ui\data.json
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
}
If (${Env:APPVEYOR_REPO_TAG} -NotMatch "true") { If (${Env:APPVEYOR_REPO_TAG} -NotMatch "true") {
C:\Python27\python.exe packaging\append_sha_to_version.py lbrynet\__init__.py ${Env:APPVEYOR_REPO_COMMIT} C:\Python27\python.exe packaging\append_sha_to_version.py lbrynet\__init__.py ${Env:APPVEYOR_REPO_COMMIT}
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
wget https://s3.amazonaws.com/lbry-ui/development/dist.zip -OutFile dist.zip
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } AddUi
Expand-Archive dist.zip -dest lbrynet\resources\ui }
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } ElseIf (${Env:APPVEYOR_REPO_TAG_NAME} -Match "v\d+.\d+.\d+-rc\d+") {
wget https://s3.amazonaws.com/lbry-ui/development/data.json -OutFile lbrynet\resources\ui\data.json AddUi
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
} }
C:\Python27\python.exe setup.py build bdist_msi C:\Python27\python.exe setup.py build bdist_msi