Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into stdevMac_t344_add_…
Browse files Browse the repository at this point in the history
…release_steps
  • Loading branch information
stdevMac committed Mar 6, 2020
2 parents 83301d6 + 44dd804 commit c82813e
Show file tree
Hide file tree
Showing 4,103 changed files with 768,110 additions and 375,891 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

### Added

- Use sky-wallet as signer.
- Spend in single transaction coins owned by multiple wallets (same altcoin plugin)
- Added logger for the app and proper error handling
- Built-in support for SkyWallet hardware wallet as signer for Skycoin transactions
Expand Down
Loading

0 comments on commit c82813e

Please sign in to comment.