Skip to content

Commit

Permalink
Merge branch 'develop' into stdevAntiD2ta_t263_Format_numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
AntiD2ta committed Jan 4, 2020
2 parents a5712bb + 2423029 commit f72c9b0
Show file tree
Hide file tree
Showing 30 changed files with 1,693 additions and 513 deletions.
64 changes: 39 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ go:
services:
- docker
go_import_path: github.com/fibercrypto/fibercryptowallet
cache:
directories:
- $GOPATH/src/github.com/therecipe
- $GOPATH/bin
matrix:
include:
- stage: RPI
Expand All @@ -14,52 +18,63 @@ matrix:
- DEFAULT_ARCH=rpi2 make install-docker-deps
- DEFAULT_ARCH=rpi3 make install-docker-deps
- make install-deps-no-envs
- make install-coveralls
script:
- make clean
- DEFAULT_TARGET=rpi1 make build-docker
- DEFAULT_TARGET=rpi2 make build-docker
- DEFAULT_TARGET=rpi3 make build-docker
- make lint
- make test
- make run-docker CMD='make test'
- stage: Android
if: branch = release*$
install:
- DEFAULT_ARCH=android make install-docker-deps
- make install-deps-no-envs
- make install-coveralls
script:
- make clean
- DEFAULT_TARGET=android make build-docker
- DEFAULT_TARGET=android-emulator make build-docker
- make lint
- make test
- make test-cover-travis
- make run-docker CMD='make test'
- make run-docker CMD='make install coveralls ; make test-cover-travis'
- stage: Linux
install:
- make install-docker-deps
- make install-deps-no-envs
- make install-linters
- make install-coveralls
script:
- make clean
- DEFAULT_TARGET=linux make build-docker
- make test
- make lint
- make test-cover-travis
- stage: Windows
os: windows
install:
- choco install make -y
- travis_wait make install-deps-Windows
- make install-linters
- make install-coveralls
script:
- make build
- make test
- make build-icon
- make clean
- make run-docker CMD='make test'
- make lint
- make test-cover-travis
- make run-docker CMD='make install-coveralls ; make test-cover-travis'
# FIXME: Restore Windows builds
# - stage: Windows
# os: windows
# env:
# - QT5_BASE_DIR: C:/Qt/5.13.0/msvc2017
# - QT_DIR: C:/Qt
# - QT_QMAKE_DIR: C:/Qt/5.13.0/mingw73_64/bin
# install:
# - choco install make -y
# - choco install unzip -y
# #- df -h
# #- .travis/install-qt-win.sh
# #- df -h
# #- ls C:/Qt
# #- ls C:/Qt/5.13.0
# #- ls C:/Qt/5.13.0/mingw73_64
# #- ls C:/Qt/5.13.0/mingw73_64/bin
# - travis_wait 50 make install-deps-Windows
# - df -h
# - make install-linters
# - make install-coveralls
# script:
# - make build
# - make test
# - make build-icon
# - make test-cover-travis
- stage: MacOS
os: osx
osx_image: xcode10.2
Expand All @@ -77,8 +92,8 @@ notifications:
email: false
webhooks:
urls:
- https://fathomless-fjord-24024.herokuapp.com/notify
- https://coveralls.io/webhook
- https://fathomless-fjord-24024.herokuapp.com/notify
- https://coveralls.io/webhook

before_deploy:
- export VERSION="$(git describe --tags --exact-match HEAD 2> /dev/null)"
Expand All @@ -97,6 +112,5 @@ deploy:
draft: true
overwrite: true
on:
repo: fibercrypto/FiberCryptoWallet
repo: fibercrypto/fibercryptowallet
tags: true

23 changes: 23 additions & 0 deletions .travis/install-qt-win.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
set -eu -o pipefail

if [ -e "$QT5_BASE_DIR/bin/moc.exe" ]; then
echo "Found an existing Qt installation at $QT5_BASE_DIR"
exit
fi

echo "Downloading the installer..."
# https is of no use if it redirects to a http mirror...
curl -vLo ~/qt-unified-windows-x86-online.exe http://download.qt.io/official_releases/online_installers/qt-unified-windows-x86-online.exe

echo "Installing..."
# Run installer and save the installer output. To avoid hitting the timeout,
# periodically print some progress. On error, show the full log and abort.
~/qt-unified-windows-x86-online.exe --verbose --script .travis/qt-installer-windows.qs
#|
# tee ~/qt-installer-output.txt |
# .travis/report-progress.sh ||
# (cat ~/qt-installer-output.txt; exit 1)
#
#printf 'Installation size: '
#du -sm "$QT5_BASE_DIR" 2>&1 ||
# (cat ~/qt-installer-output.txt; exit 1)
95 changes: 95 additions & 0 deletions .travis/qt-installer-windows.qs
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@


var INSTALL_COMPONENTS = [
"qt.qt5.5130.win64_mingw73",
"qt.qt5.5130.qtscript",
"qt.qt5.5130.qtscript.win64_mingw73",

];

function Controller() {
installer.autoRejectMessageBoxes();
installer.installationFinished.connect(function() {
gui.clickButton(buttons.NextButton);
})
}

Controller.prototype.WelcomePageCallback = function() {
// click delay here because the next button is initially disabled for ~1 second
gui.clickButton(buttons.NextButton, 3000);
}

Controller.prototype.CredentialsPageCallback = function() {
gui.clickButton(buttons.NextButton);
}

Controller.prototype.IntroductionPageCallback = function() {
gui.clickButton(buttons.NextButton);
}

Controller.prototype.DynamicTelemetryPluginFormCallback = function() {
gui.currentPageWidget().TelemetryPluginForm.statisticGroupBox.disableStatisticRadioButton.setChecked(true);
gui.clickButton(buttons.NextButton);

//for(var key in widget.TelemetryPluginForm.statisticGroupBox){
// console.log(key);
//}
}

Controller.prototype.TargetDirectoryPageCallback = function()
{
// Keep default at "C:\Qt".
//gui.currentPageWidget().TargetDirectoryLineEdit.setText("E:\\Qt");
//gui.currentPageWidget().TargetDirectoryLineEdit.setText(installer.value("HomeDir") + "/Qt");
gui.clickButton(buttons.NextButton);
}

Controller.prototype.ComponentSelectionPageCallback = function() {

// https://doc-snapshots.qt.io/qtifw-3.1/noninteractive.html
var page = gui.pageWidgetByObjectName("ComponentSelectionPage");

var archiveCheckBox = gui.findChild(page, "Archive");
var latestCheckBox = gui.findChild(page, "Latest releases");
var fetchButton = gui.findChild(page, "FetchCategoryButton");

archiveCheckBox.click();
latestCheckBox.click();
fetchButton.click();

var widget = gui.currentPageWidget();

widget.deselectAll();

for (var i = 0; i < INSTALL_COMPONENTS.length; i++) {
widget.selectComponent(INSTALL_COMPONENTS[i]);
}

//widget.selectComponent("qt.tools.qtcreator");
//widget.selectComponent("qt.55.qt3d");

gui.clickButton(buttons.NextButton);
}

Controller.prototype.LicenseAgreementPageCallback = function() {
gui.currentPageWidget().AcceptLicenseRadioButton.setChecked(true);
gui.clickButton(buttons.NextButton);
}

Controller.prototype.StartMenuDirectoryPageCallback = function() {
gui.clickButton(buttons.NextButton);
}

Controller.prototype.ReadyForInstallationPageCallback = function()
{
gui.clickButton(buttons.NextButton);
}

Controller.prototype.FinishedPageCallback = function() {
var checkBoxForm = gui.currentPageWidget().LaunchQtCreatorCheckBoxForm;
if (checkBoxForm && checkBoxForm.launchQtCreatorCheckBox) {
checkBoxForm.launchQtCreatorCheckBox.checked = false;
}
gui.clickButton(buttons.FinishButton);
}

35 changes: 35 additions & 0 deletions .travis/report-progress.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@

set -eu

# Default to a 60 seconds interval between printing messages.
PERIOD=${1:-60}

nexttime=$PERIOD
msg=
count=0

# Reset timer (SECONDS is a special Bash variable).
SECONDS=0

while true; do
# Periodically report the last read line.
timeleft=$((nexttime-SECONDS))
while [ $timeleft -le 0 ]; do
((nexttime+=PERIOD))
((timeleft+=PERIOD))
printf "[progress] %3d %s\n" $SECONDS "${msg:-(no output)}"
msg=
done

if read -r -t $timeleft line; then
# Save line for later.
((count+=1))
msg="Line $count: $line"
continue
elif [ $? -le 128 ]; then
# EOF (as opposed to a timeout)
[ -z "$msg" ] || printf "[progress] %3d %s\n" $SECONDS "$msg"
printf "[progress] %3d done (read %d lines).\n" $SECONDS $count
break
fi
done
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- QR code images are buttons
- GUI to add wallets
- GUI to generate new addresses for a wallet

- Added Address Book
27 changes: 17 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
# 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

We use github to host code, to track issues and feature requests, as well as accept pull requests.

## We Use [Github Flow](https://guides.github.com/introduction/flow/index.html), So All Code Changes Happen Through Pull Requests

Pull requests are the best way to propose changes to the codebase (we use [Github Flow](https://guides.github.com/introduction/flow/index.html)). We actively welcome your pull requests:

1. Fork the repo and create your branch from `master`.
* Branch name should follow the pattern `<USER>_t<ISSUE>_<DESC>` e.g. `olemis_t256_readme_badges` for @olemis to submit a patch to fix issue #256 by adding project badges in `README.md` file.
- Branch name should follow the pattern `<USER>_t<ISSUE>_<DESC>` e.g. `olemis_t256_readme_badges` for @olemis to submit a patch to fix issue #256 by adding project badges in `README.md` file.
2. If you've added code that should be tested, add tests.
3. If you've changed APIs, update the documentation.
4. If contributions add a relevant feature, describe changes in CHANGELOG.md
Expand All @@ -24,33 +27,37 @@ Pull requests are the best way to propose changes to the codebase (we use [Githu
8. Issue that pull request!

## 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.

**Great Bug Reports** tend to have:

- A quick summary and/or background
- Steps to reproduce
- Be specific!
- Give sample code if you can. [This stackoverflow question](http://stackoverflow.com/q/12488905/180626) includes sample code that *anyone* with a base R setup can run to reproduce what reporter was seeing
- Give sample code if you can. [This stackoverflow question](http://stackoverflow.com/q/12488905/180626) includes sample code that _anyone_ with a base R setup can run to reproduce what reporter was seeing
- What you expected would happen
- What actually happens
- Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)

People *love* thorough bug reports. I'm not even kidding.
People _love_ thorough bug reports. I'm not even kidding.

## Use a Consistent Coding Style

Code style shall respect golang standards and is checked by a number of linters after running `make lint` from the command line.

## License

By contributing, you agree that your contributions will be licensed under its GPLv3 License.

## References
This document was adapted from the open-source contribution guidelines for [Facebook's Draft](https://github.com/facebook/draft-js/blob/a9316a723f9e918afde44dea68b5f9f39b7d9b00/CONTRIBUTING.md).


This document was adapted from the open-source contribution guidelines for [Facebook's Draft](https://github.com/facebook/draft-js/blob/a9316a723f9e918afde44dea68b5f9f39b7d9b00/CONTRIBUTING.md).
Loading

0 comments on commit f72c9b0

Please sign in to comment.