Skip to content

Commit

Permalink
Merge b704262 into 0912810
Browse files Browse the repository at this point in the history
  • Loading branch information
stdevAlDen committed Dec 7, 2019
2 parents 0912810 + b704262 commit f5190ba
Show file tree
Hide file tree
Showing 3,761 changed files with 1,313,643 additions and 813 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,3 @@ android
# Temporary build files
rcc_cgo_*.go


36 changes: 35 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ go:
- 1.12.6
services:
- docker
- xvfb
go_import_path: github.com/fibercrypto/fibercryptowallet
env:
global:
- XARGS="-screen 0 1024x768x24"

matrix:
include:
- stage: RPI
Expand Down Expand Up @@ -36,15 +41,29 @@ matrix:
- make test
- 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
- make install-coveralls
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 test
- make test-skyhw
- make lint
- make test-cover-travis
- stage: Windows
Expand All @@ -63,13 +82,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 All @@ -93,6 +127,6 @@ deploy:
draft: true
overwrite: true
on:
repo: fibercrypto/FiberCryptoWallet
repo: fibercrypto/fibercryptowallet
tags: true

10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Contributing to FiberCrypto projects
We love your input! We want to make contributing to this project as easy and transparent as possible, whether it's:

- Submitting a [bug report](https://github.com/fibercrypto/FiberCryptoWallet/issues/new?labels=bug&template=bug_report.md)
- Submitting a [bug report](https://github.com/fibercrypto/fibercryptowallet/issues/new?labels=bug&template=bug_report.md)
- Discussing the current state of the code on [Blockchain Cuba channel](https://t.me/BlockchainCuba)
- Submitting a [new Github pull request](https://github.com/fibercrypto/FiberCryptoWallet/pull/new) with a fix
- Proposing new [features requests](https://github.com/fibercrypto/FiberCryptoWallet/issues/new?labels=feature&template=feature_request.md)
- Submitting a [new Github pull request](https://github.com/fibercrypto/fibercryptowallet/pull/new) with a fix
- Proposing new [features requests](https://github.com/fibercrypto/fibercryptowallet/issues/new?labels=feature&template=feature_request.md)
- Becoming a maintainer

## We Develop with Github
Expand All @@ -26,8 +26,8 @@ Pull requests are the best way to propose changes to the codebase (we use [Githu
## Any contributions you make will be under the GPLv3 Software License
In short, when you submit code changes, your submissions are understood to be under the same [GPLv3 License](https://choosealicense.com/licenses/gpl-3.0/) that covers the project. Feel free to contact the maintainers if that's a concern.

## Report bugs using Github's [issues](https://github.com/fibercrypto/FiberCryptoWallet/issues)
We use GitHub issues to track public bugs. Report a bug by [opening a new issue](https://github.com/fibercrypto/FiberCryptoWallet/issues/new/choose); it's that easy!
## Report bugs using Github's [issues](https://github.com/fibercrypto/fibercryptowallet/issues)
We use GitHub issues to track public bugs. Report a bug by [opening a new issue](https://github.com/fibercrypto/fibercryptowallet/issues/new/choose); it's that easy!

## Write bug reports with detail, background, and sample code
[This is an example](http://stackoverflow.com/q/12488905/180626) of a bug report that we think it's not a bad model. Here's [another example from Craig Hockenberry](http://www.openradar.me/11905408), an app developer whom we greatly respect.
Expand Down
Loading

0 comments on commit f5190ba

Please sign in to comment.