Skip to content

Commit

Permalink
Merge f91fde3 into 3ddcc55
Browse files Browse the repository at this point in the history
  • Loading branch information
stdevAlDen committed Feb 13, 2020
2 parents 3ddcc55 + f91fde3 commit c408219
Show file tree
Hide file tree
Showing 1,826 changed files with 452,674 additions and 54,073 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
*.so

# Distribution / packaging
vendor/github.com/therecipe/qt/

# Configuration
*.vscode
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

34 changes: 34 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@ go:
- 1.12.6
services:
- docker
- xvfb
go_import_path: github.com/fibercrypto/fibercryptowallet
cache:
directories:
- $GOPATH/src/github.com/therecipe
- $GOPATH/bin
env:
global:
- XARGS="-screen 0 1024x768x24"

matrix:
include:
- stage: RPI
Expand Down Expand Up @@ -38,15 +43,29 @@ matrix:
- make run-docker CMD='make test'
- make run-docker CMD='make install coveralls ; make test-cover-travis'
- stage: Linux
before_install:
- source ./ci-scripts/install-$TRAVIS_OS_NAME.sh
install:
- make install-docker-deps
- make install-deps-no-envs
- make install-linters
before_script:
- echo "PATH=$PATH";
- echo "PIP=$PIP";
- PYTHON=python3 PIP=pip3 make -C tmp/hardware-wallet clean
- PYTHON=python3 PIP=pip3 make -C tmp/hardware-wallet/tiny-firmware/protob install-deps-nanopb
- PYTHON=python3 PIP=pip3 make -C tmp/hardware-wallet/tiny-firmware/protob/nanopb/vendor/nanopb/generator/proto
- PYTHON=python3 PIP=pip3 make -C tmp/hardware-wallet emulator
- make -C ./tmp/hardware-wallet run-emulator & true;
# Run self-tests
- ps aux | grep emulator

script:
- make clean
- DEFAULT_TARGET=linux make build-docker
- make clean
- make run-docker CMD='make test'
- make run-docker CMD='make test-skyhw'
- make lint
- make run-docker CMD='make install-coveralls ; make test-cover-travis'
# FIXME: Restore Windows builds
Expand Down Expand Up @@ -78,13 +97,28 @@ matrix:
- stage: MacOS
os: osx
osx_image: xcode10.2
before_install:
- source ./ci-scripts/install-$TRAVIS_OS_NAME.sh
install:
- make install-deps
- make install-coveralls
before_script:
- echo "PATH=$PATH";
- echo "PIP=$PIP";
# Start Xvfb on osx
- ( sudo Xvfb :99 -ac ${XARGS}; echo "Xvfb ok" )& export DISPLAY=:99
- PYTHON=python3 PIP=pip3 make -C tmp/hardware-wallet clean
- PYTHON=python3 PIP=pip3 make -C tmp/hardware-wallet/tiny-firmware/protob install-deps-nanopb
- PYTHON=python3 PIP=pip3 make -C tmp/hardware-wallet/tiny-firmware/protob/nanopb/vendor/nanopb/generator/proto
- PYTHON=python3 PIP=pip3 make -C tmp/hardware-wallet emulator
- make -C ./tmp/hardware-wallet run-emulator & true;
# Run self-tests
- ps aux | grep emulator
script:
- make clean
- make build
- make test
- make test-skyhw
- make build-icon
- make lint
- make test-cover-travis
Expand Down

0 comments on commit c408219

Please sign in to comment.