LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

fix torba version on travis

Browse source
This commit is contained in:
Jack Robison 2019-06-05 17:35:26 -04:00
parent f5b7aaac18
commit 4409b8c4f8
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
4 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.travis.yml
View file

@ -4,6 +4,8 @@ language: python
python: "3.7" python: "3.7"
env: env:
global:
# must also be updated in wine_build.sh
- TORBA=master - TORBA=master
jobs: jobs:
@ -59,7 +61,7 @@ jobs:
- docker pull lbry/pyinstaller34_32bits:py371 - docker pull lbry/pyinstaller34_32bits:py371
script: script:
- python scripts/set_build.py - python scripts/set_build.py
- docker run -v "$(pwd):/src/lbry" lbry/pyinstaller34_32bits:py371 lbry/scripts/wine_build.sh ${TORBA} - docker run -v "$(pwd):/src/lbry" lbry/pyinstaller34_32bits:py371 lbry/scripts/wine_build.sh
- sudo zip -j dist/lbrynet-windows.zip dist/lbrynet.exe - sudo zip -j dist/lbrynet-windows.zip dist/lbrynet.exe
deploy: deploy:
provider: releases provider: releases
@ -125,7 +127,7 @@ jobs:
script: script:
- set -e - set -e
- echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin - echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
- travis_retry docker build -t lbry/wallet-server:$TRAVIS_TAG -f scripts/Dockerfile.wallet_server . - travis_retry docker build -t lbry/wallet-server:$TRAVIS_TAG -f scripts/Dockerfile.wallet_server --build-arg TORBA_VERSION=${TORBA} .
- docker push lbry/wallet-server:$TRAVIS_TAG - docker push lbry/wallet-server:$TRAVIS_TAG
- if: tag IS blank AND branch = master AND NOT type IN (pull_request) - if: tag IS blank AND branch = master AND NOT type IN (pull_request)
stage: build stage: build
@ -133,7 +135,7 @@ jobs:
script: script:
- set -e - set -e
- echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin - echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
- travis_retry docker build -t lbry/wallet-server:master -f scripts/Dockerfile.wallet_server . - travis_retry docker build -t lbry/wallet-server:master -f scripts/Dockerfile.wallet_server --build-arg TORBA_VERSION=${TORBA} .
- docker push lbry/wallet-server:master - docker push lbry/wallet-server:master
cache: cache:

4
scripts/Dockerfile.lbry_orchstr8
View file

@ -1,5 +1,7 @@
FROM debian:buster-slim FROM debian:buster-slim
ARG TORBA_VERSION=master
RUN apt-get update && \ RUN apt-get update && \
apt-get upgrade -y && \ apt-get upgrade -y && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
@ -15,7 +17,7 @@ RUN python3.7 -m pip install --upgrade pip setuptools wheel
COPY . /app COPY . /app
WORKDIR /app WORKDIR /app
RUN python3.7 -m pip install git+https://github.com/lbryio/torba.git#egg=torba RUN python3.7 -m pip install --user git+https://github.com/lbryio/torba.git@${TORBA_VERSION}#egg=torba
RUN python3.7 -m pip install -e . RUN python3.7 -m pip install -e .
# Orchstr8 API # Orchstr8 API

3
scripts/Dockerfile.wallet_server
View file

@ -1,6 +1,7 @@
FROM debian:buster-slim FROM debian:buster-slim
ARG user=lbry ARG user=lbry
ARG TORBA_VERSION=master
# create an unprivileged user # create an unprivileged user
RUN groupadd -g 999 $user && useradd -r -u 999 -g $user $user RUN groupadd -g 999 $user && useradd -r -u 999 -g $user $user
@ -23,7 +24,7 @@ WORKDIR /home/$user
RUN python3.7 -m pip install --upgrade pip setuptools RUN python3.7 -m pip install --upgrade pip setuptools
# get torba # get torba
RUN python3.7 -m pip install --user git+https://github.com/lbryio/torba.git#egg=torba RUN python3.7 -m pip install --user git+https://github.com/lbryio/torba.git@${TORBA_VERSION}#egg=torba
# get uvloop # get uvloop
RUN python3.7 -m pip install --user uvloop RUN python3.7 -m pip install --user uvloop

11
scripts/wine_build.sh
View file

@ -1,9 +1,11 @@
set -x set -x
TORBA=$1 # must also be updated in travis.yml
TORBA_VERSION=master
rm -rf /tmp/.wine-* rm -rf /tmp/.wine-*
apt-get -qq update apt-get -qq update
apt-get -qq install -y git apt-get -qq install -y git
pip install setuptools_scm pip install setuptools_scm
cd lbry cd lbry
@ -12,8 +14,13 @@ cd lbry
wget -Onetifaces-0.10.7-cp37-cp37m-win32.whl https://ci.appveyor.com/api/buildjobs/6hworunifsymrhp2/artifacts/dist%2Fnetifaces-0.10.7-cp37-cp37m-win32.whl wget -Onetifaces-0.10.7-cp37-cp37m-win32.whl https://ci.appveyor.com/api/buildjobs/6hworunifsymrhp2/artifacts/dist%2Fnetifaces-0.10.7-cp37-cp37m-win32.whl
pip install netifaces-0.10.7-cp37-cp37m-win32.whl pip install netifaces-0.10.7-cp37-cp37m-win32.whl
pip install git+https://github.com/lbryio/torba.git@${TORBA}#egg=torba git clone --depth=1 --single-branch --branch ${TORBA_VERSION} https://github.com/lbryio/torba.git
cd torba
pip install .
cd ..
rm -rf torba
pip show torba
pip install -e . pip install -e .
pip install pywin32 pip install pywin32