diff --git a/.travis.yml b/.travis.yml index c9efcf5f9..49041fed5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,67 +1,7 @@ -sudo: false -dist: trusty -language: c - -compiler: - - clang - - gcc - -env: - - GOAL=stm32 TOOLCHAIN_SHORTVER=7-2017q4 TOOLCHAIN_LONGVER=gcc-arm-none-eabi-7-2017-q4-major - # - GOAL=unix - - GOAL=src - -matrix: - exclude: - - compiler: clang - env: GOAL=stm32 - - compiler: clang - env: GOAL=src - -addons: - apt: - packages: - - build-essential - - gcc-multilib - - libusb-1.0-0-dev - - libudev-dev - - python3 - - python3-pip - -before_install: - - pip3 install --user --upgrade pip setuptools wheel - -install: - - pip3 install --user scons==3.0.1 - - pip3 install --user flake8==3.5.0 - - pip3 install --user pytest==3.4.2 - - pip3 install --user ecdsa==0.13 mnemonic==0.18 requests - - pip3 install --user click==6.7 pyblake2==1.1.0 rlp==0.6.0 - - pip3 install --user --no-deps trezor==0.9.1 - -before_script: - - test "$GOAL" != "stm32" || wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/$TOOLCHAIN_SHORTVER/$TOOLCHAIN_LONGVER-linux.tar.bz2 - - test "$GOAL" != "stm32" || tar xfj $TOOLCHAIN_LONGVER-linux.tar.bz2 - - test "$GOAL" != "stm32" || export PATH=$PWD/$TOOLCHAIN_LONGVER/bin:$PATH - +language: generic +services: + - docker script: - - test "$GOAL" != "stm32" || make build_cross - - test "$GOAL" != "stm32" || make build_boardloader - - test "$GOAL" != "stm32" || make build_bootloader - - test "$GOAL" != "stm32" || make build_prodtest - - test "$GOAL" != "stm32" || make build_firmware - - test "$GOAL" != "stm32" || make sizecheck - - - test "$GOAL" != "unix" || make build_unix_noui - - test "$GOAL" != "unix" || make test - - test "$GOAL" != "unix" || make test_emu - - # - test "$GOAL" != "src" || make style - -notifications: - webhooks: - urls: - - http://ci-bot.satoshilabs.com:5000/travis - on_success: always - on_failure: always - on_start: always + - pwd + - ls + - ./build-docker.sh diff --git a/Dockerfile b/Dockerfile index 3788ad736..09316ddcb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,8 +24,12 @@ ENV PATH=/opt/$TOOLCHAIN_LONGVER/bin:$PATH # install python tools -RUN pip3 install click pyblake2 scons -RUN pip3 install --no-deps git+https://github.com/trezor/python-trezor.git@master +RUN pip3 install scons==3.0.1 +RUN pip3 install flake8==3.5.0 +RUN pip3 install pytest==3.4.2 +RUN pip3 install ecdsa==0.13 mnemonic==0.18 requests +RUN pip3 install click==6.7 pyblake2==1.1.0 rlp==0.6.0 +RUN pip3 install --no-deps trezor==0.9.1 # workarounds for weird default install diff --git a/build-docker.sh b/build-docker.sh index 1219d76ed..f0bf95fde 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -2,12 +2,12 @@ set -e IMAGE=trezor-core-build -TAG=${1:-master} +TAG=${1:-2.0.6-zcoin} docker build -t $IMAGE . docker run -t -v $(pwd)/build-docker:/build:z $IMAGE /bin/sh -c "\ - git clone https://github.com/trezor/trezor-core && \ + git clone https://github.com/yura-pakhuchiy/trezor-core && \ cd trezor-core && \ ln -s /build build && git checkout $TAG && \