From 0bd1734965a0b8bf742ff129a46da314059845ac Mon Sep 17 00:00:00 2001 From: Maykel Arias Torres Date: Mon, 25 Nov 2019 21:31:22 -0500 Subject: [PATCH 1/9] [travis] refs #256 Added conf the coveralls --- .coveralls.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .coveralls.yml diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 00000000..2353e064 --- /dev/null +++ b/.coveralls.yml @@ -0,0 +1,2 @@ +service_name: travis-pro +repo_token: 1zkcSxi8TkcxpL2zTQOK9G5FFoVgWjceP From 1299162be86f9b7b30b80c2aaa97e36f2ea55d3b Mon Sep 17 00:00:00 2001 From: Maykel Arias Torres Date: Mon, 25 Nov 2019 21:37:38 -0500 Subject: [PATCH 2/9] [README] refs #256 Added status coverage --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b8555731..ad3680b5 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![Build Status](https://travis-ci.org/fibercrypto/FiberCryptoWallet.svg?branch=develop)](https://travis-ci.org/fibercrypto/FiberCryptoWallet) [![Contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg)](CONTRIBUTING.md) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](LICENSE.GPLv3) +[![Coverage Status](https://coveralls.io/repos/github/fibercrypto/FiberCryptoWallet/badge.svg?branch=develop)](https://coveralls.io/github/fibercrypto/FiberCryptoWallet?branch=develop) FiberCrypto wallet is a cryptocurrency software wallet aimed at: From 7c0a4f40c2f47edac1a1f06b2ad28a92c4d9bfbf Mon Sep 17 00:00:00 2001 From: Maykel Arias Torres Date: Tue, 26 Nov 2019 20:02:54 -0500 Subject: [PATCH 3/9] [travis] refs #256 Added support `coveralls` in `travis` --- .coveralls.yml | 2 -- .travis.yml | 11 ++++++++++- Makefile | 5 +++++ 3 files changed, 15 insertions(+), 3 deletions(-) delete mode 100644 .coveralls.yml diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 2353e064..00000000 --- a/.coveralls.yml +++ /dev/null @@ -1,2 +0,0 @@ -service_name: travis-pro -repo_token: 1zkcSxi8TkcxpL2zTQOK9G5FFoVgWjceP diff --git a/.travis.yml b/.travis.yml index 5f60ea86..4a3bbd23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,8 @@ matrix: - DEFAULT_ARCH=rpi2 make install-docker-deps - DEFAULT_ARCH=rpi3 make install-docker-deps - make install-deps-no-envs + - go get golang.org/x/tools/cmd/cover + - go get github.com/mattn/goveralls script: - make clean - DEFAULT_TARGET=rpi1 make build-docker @@ -32,6 +34,7 @@ matrix: - DEFAULT_TARGET=android-emulator make build-docker - make lint - make test + - make test-cover-travis - stage: Linux install: - make install-docker-deps @@ -42,6 +45,7 @@ matrix: - DEFAULT_TARGET=linux make build-docker - make test - make lint + - make test-cover-travis - stage: Windows os: windows install: @@ -53,6 +57,7 @@ matrix: - make test - make build-icon - make lint + - make test-cover-travis - stage: MacOS os: osx osx_image: xcode10.2 @@ -64,6 +69,7 @@ matrix: - make test - make build-icon - make lint + - make test-cover-travis notifications: email: false webhooks: https://fathomless-fjord-24024.herokuapp.com/notify @@ -83,6 +89,9 @@ deploy: kip_cleanup: true draft: true overwrite: true - on: + on: repo: fibercrypto/FiberCryptoWallet tags: true +env: + global: + secure: Kgk8K+M8Ean9KjB1Sbke9g3F/5LEDsOHRhuU3KMroOJbXOKVsfICj2Xu3DwBiuFmyBIDnV/DpDNjkZPSQYGDxIXyPDpOLqg549iyyH5Xrc3ecFXIWwk3ztU9HZsXGdy5YOj8LMDuqzq/6NZx5/sW6YMZtCzzXbBXeB6mLYeiaX1lrL4CB9rnDBgEG3gDkoHnI5eS9KTBhSgxIhVDn3/Tas5DWuAjDF+tkmKJGWG8CKN4raja6JsYlloCjzzzoS/EkW/hfEHahadpZIV6znej0KIVR3gQS3bQGp0Eim/9RnWGK273rapsksr16hZkQKCEIQcSahFG0r921Evwlt0kXoEtFIkaKynqt1pGGCD1YiwE/6hK6KB0zmp9rJkESl2z48g7CF87hoCJwTAk+FO853D7152qAAbMd46Fh4kDH5+KIfuuu8ew3WIkp4GNytYadu1yedGTHsESn9FEwJxxYSV0ZiGAbn5SXw8olZE7DbXK/aLghTaXOgBb/aBzbqIZIe4ZPDFm14v8BGU2mqPJdhFRi5QKDMHUBkZ1Uww95QwxTICzztVhlTZny01wiLaCPA1BNjvyWzbP4sHrOKNKCBgmPsBH1jAvINhAkeyNBn8lc8P8S8Va7iEJAGNgM8zarj6Nnt+iPbDi+48hHfcOMUoV+oGqh9t63+DDfCWQSp4= diff --git a/Makefile b/Makefile index c83bed23..830b9cf5 100644 --- a/Makefile +++ b/Makefile @@ -199,6 +199,11 @@ test-sky-launch-html-cover: go test -coverprofile=$(COVERAGEFILE) -timeout 30s github.com/fibercrypto/FiberCryptoWallet/src/coin/skycoin/models go tool cover -html=$(COVERAGEFILE) -o $(COVERAGEHTML) +test-cover-travis: + go test -covermode=count -coverprofile=coverage.out -timeout 30s github.com/fibercrypto/FiberCryptoWallet/src/util + $HOME/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken $COVERALLS_TOKEN + + test-cover: clean-test test-sky-launch-html-cover ## Show more details of test coverage test: clean-test test-core test-sky ## Run project test suite From 81ffee1a894e0beecda41b12b34c73ceae6a3233 Mon Sep 17 00:00:00 2001 From: Maykel Arias Torres Date: Tue, 26 Nov 2019 20:17:21 -0500 Subject: [PATCH 4/9] [travis] refs #256 Correcting path to folder coverall in golang --- .travis.yml | 8 ++++++++ Makefile | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4a3bbd23..c8b28f9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,8 @@ matrix: install: - DEFAULT_ARCH=android make install-docker-deps - make install-deps-no-envs + - go get golang.org/x/tools/cmd/cover + - go get github.com/mattn/goveralls script: - make clean - DEFAULT_TARGET=android make build-docker @@ -40,6 +42,8 @@ matrix: - make install-docker-deps - make install-deps-no-envs - make install-linters + - go get golang.org/x/tools/cmd/cover + - go get github.com/mattn/goveralls script: - make clean - DEFAULT_TARGET=linux make build-docker @@ -52,6 +56,8 @@ matrix: - choco install make -y - travis_wait make install-deps-Windows - make install-linters + - go get golang.org/x/tools/cmd/cover + - go get github.com/mattn/goveralls script: - make build - make test @@ -63,6 +69,8 @@ matrix: osx_image: xcode10.2 install: - make install-deps + - go get golang.org/x/tools/cmd/cover + - go get github.com/mattn/goveralls script: - make clean - make build diff --git a/Makefile b/Makefile index 830b9cf5..b31391cf 100644 --- a/Makefile +++ b/Makefile @@ -201,7 +201,7 @@ test-sky-launch-html-cover: test-cover-travis: go test -covermode=count -coverprofile=coverage.out -timeout 30s github.com/fibercrypto/FiberCryptoWallet/src/util - $HOME/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken $COVERALLS_TOKEN + $(HOME)/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken $(COVERALLS_TOKEN) test-cover: clean-test test-sky-launch-html-cover ## Show more details of test coverage From 07351e60087eb9b2bc0716bf25524e92b9fe0580 Mon Sep 17 00:00:00 2001 From: Maykel Arias Torres Date: Tue, 26 Nov 2019 22:05:38 -0500 Subject: [PATCH 5/9] [travis] refs #256 Added env global `COVERALLS_TOKEN` encrypt --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c8b28f9f..3e823ec8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,9 @@ go: services: - docker go_import_path: github.com/fibercrypto/FiberCryptoWallet +env: + global: + secure: Kgk8K+M8Ean9KjB1Sbke9g3F/5LEDsOHRhuU3KMroOJbXOKVsfICj2Xu3DwBiuFmyBIDnV/DpDNjkZPSQYGDxIXyPDpOLqg549iyyH5Xrc3ecFXIWwk3ztU9HZsXGdy5YOj8LMDuqzq/6NZx5/sW6YMZtCzzXbBXeB6mLYeiaX1lrL4CB9rnDBgEG3gDkoHnI5eS9KTBhSgxIhVDn3/Tas5DWuAjDF+tkmKJGWG8CKN4raja6JsYlloCjzzzoS/EkW/hfEHahadpZIV6znej0KIVR3gQS3bQGp0Eim/9RnWGK273rapsksr16hZkQKCEIQcSahFG0r921Evwlt0kXoEtFIkaKynqt1pGGCD1YiwE/6hK6KB0zmp9rJkESl2z48g7CF87hoCJwTAk+FO853D7152qAAbMd46Fh4kDH5+KIfuuu8ew3WIkp4GNytYadu1yedGTHsESn9FEwJxxYSV0ZiGAbn5SXw8olZE7DbXK/aLghTaXOgBb/aBzbqIZIe4ZPDFm14v8BGU2mqPJdhFRi5QKDMHUBkZ1Uww95QwxTICzztVhlTZny01wiLaCPA1BNjvyWzbP4sHrOKNKCBgmPsBH1jAvINhAkeyNBn8lc8P8S8Va7iEJAGNgM8zarj6Nnt+iPbDi+48hHfcOMUoV+oGqh9t63+DDfCWQSp4= matrix: include: - stage: RPI @@ -100,6 +103,4 @@ deploy: on: repo: fibercrypto/FiberCryptoWallet tags: true -env: - global: - secure: Kgk8K+M8Ean9KjB1Sbke9g3F/5LEDsOHRhuU3KMroOJbXOKVsfICj2Xu3DwBiuFmyBIDnV/DpDNjkZPSQYGDxIXyPDpOLqg549iyyH5Xrc3ecFXIWwk3ztU9HZsXGdy5YOj8LMDuqzq/6NZx5/sW6YMZtCzzXbBXeB6mLYeiaX1lrL4CB9rnDBgEG3gDkoHnI5eS9KTBhSgxIhVDn3/Tas5DWuAjDF+tkmKJGWG8CKN4raja6JsYlloCjzzzoS/EkW/hfEHahadpZIV6znej0KIVR3gQS3bQGp0Eim/9RnWGK273rapsksr16hZkQKCEIQcSahFG0r921Evwlt0kXoEtFIkaKynqt1pGGCD1YiwE/6hK6KB0zmp9rJkESl2z48g7CF87hoCJwTAk+FO853D7152qAAbMd46Fh4kDH5+KIfuuu8ew3WIkp4GNytYadu1yedGTHsESn9FEwJxxYSV0ZiGAbn5SXw8olZE7DbXK/aLghTaXOgBb/aBzbqIZIe4ZPDFm14v8BGU2mqPJdhFRi5QKDMHUBkZ1Uww95QwxTICzztVhlTZny01wiLaCPA1BNjvyWzbP4sHrOKNKCBgmPsBH1jAvINhAkeyNBn8lc8P8S8Va7iEJAGNgM8zarj6Nnt+iPbDi+48hHfcOMUoV+oGqh9t63+DDfCWQSp4= + From 7a906290959e58b0e84069f1934cc06fb422e1bf Mon Sep 17 00:00:00 2001 From: Maykel Arias Torres Date: Tue, 26 Nov 2019 22:16:56 -0500 Subject: [PATCH 6/9] [travis] refs #256 Try show token --- .travis.yml | 3 --- Makefile | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e823ec8..a0cc8107 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,6 @@ go: services: - docker go_import_path: github.com/fibercrypto/FiberCryptoWallet -env: - global: - secure: Kgk8K+M8Ean9KjB1Sbke9g3F/5LEDsOHRhuU3KMroOJbXOKVsfICj2Xu3DwBiuFmyBIDnV/DpDNjkZPSQYGDxIXyPDpOLqg549iyyH5Xrc3ecFXIWwk3ztU9HZsXGdy5YOj8LMDuqzq/6NZx5/sW6YMZtCzzXbBXeB6mLYeiaX1lrL4CB9rnDBgEG3gDkoHnI5eS9KTBhSgxIhVDn3/Tas5DWuAjDF+tkmKJGWG8CKN4raja6JsYlloCjzzzoS/EkW/hfEHahadpZIV6znej0KIVR3gQS3bQGp0Eim/9RnWGK273rapsksr16hZkQKCEIQcSahFG0r921Evwlt0kXoEtFIkaKynqt1pGGCD1YiwE/6hK6KB0zmp9rJkESl2z48g7CF87hoCJwTAk+FO853D7152qAAbMd46Fh4kDH5+KIfuuu8ew3WIkp4GNytYadu1yedGTHsESn9FEwJxxYSV0ZiGAbn5SXw8olZE7DbXK/aLghTaXOgBb/aBzbqIZIe4ZPDFm14v8BGU2mqPJdhFRi5QKDMHUBkZ1Uww95QwxTICzztVhlTZny01wiLaCPA1BNjvyWzbP4sHrOKNKCBgmPsBH1jAvINhAkeyNBn8lc8P8S8Va7iEJAGNgM8zarj6Nnt+iPbDi+48hHfcOMUoV+oGqh9t63+DDfCWQSp4= matrix: include: - stage: RPI diff --git a/Makefile b/Makefile index b31391cf..4b66f462 100644 --- a/Makefile +++ b/Makefile @@ -201,7 +201,7 @@ test-sky-launch-html-cover: test-cover-travis: go test -covermode=count -coverprofile=coverage.out -timeout 30s github.com/fibercrypto/FiberCryptoWallet/src/util - $(HOME)/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken $(COVERALLS_TOKEN) + $(HOME)/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken 1zkcSxi8TkcxpL2zTQOK9G5FFoVgWjceP test-cover: clean-test test-sky-launch-html-cover ## Show more details of test coverage From 026f05cca1bff032420772b7bf6de992ad4e24f5 Mon Sep 17 00:00:00 2001 From: Maykel Arias Torres Date: Fri, 29 Nov 2019 22:04:38 -0500 Subject: [PATCH 7/9] [Makefile][travis] refs #256 Added `make install-coveralls` --- .travis.yml | 15 +++++---------- Makefile | 4 ++++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index a0cc8107..c2a616f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,7 @@ matrix: - DEFAULT_ARCH=rpi2 make install-docker-deps - DEFAULT_ARCH=rpi3 make install-docker-deps - make install-deps-no-envs - - go get golang.org/x/tools/cmd/cover - - go get github.com/mattn/goveralls + - make install-coveralls script: - make clean - DEFAULT_TARGET=rpi1 make build-docker @@ -28,8 +27,7 @@ matrix: install: - DEFAULT_ARCH=android make install-docker-deps - make install-deps-no-envs - - go get golang.org/x/tools/cmd/cover - - go get github.com/mattn/goveralls + - make install-coveralls script: - make clean - DEFAULT_TARGET=android make build-docker @@ -42,8 +40,7 @@ matrix: - make install-docker-deps - make install-deps-no-envs - make install-linters - - go get golang.org/x/tools/cmd/cover - - go get github.com/mattn/goveralls + - make install-coveralls script: - make clean - DEFAULT_TARGET=linux make build-docker @@ -56,8 +53,7 @@ matrix: - choco install make -y - travis_wait make install-deps-Windows - make install-linters - - go get golang.org/x/tools/cmd/cover - - go get github.com/mattn/goveralls + - make install-coveralls script: - make build - make test @@ -69,8 +65,7 @@ matrix: osx_image: xcode10.2 install: - make install-deps - - go get golang.org/x/tools/cmd/cover - - go get github.com/mattn/goveralls + - make install-coveralls script: - make clean - make build diff --git a/Makefile b/Makefile index 4b66f462..62c6200c 100644 --- a/Makefile +++ b/Makefile @@ -212,6 +212,10 @@ install-linters: ## Install linters go get -u github.com/FiloSottile/vendorcheck cat ./.travis/install-golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.21.0 +install-coveralls: + go get golang.org/x/tools/cmd/cover + go get github.com/mattn/goveralls + lint: ## Run linters. Use make install-linters first. # src needs separate linting rules golangci-lint run -c .golangci.yml ./src/coin/... From 7a725a98463a98d4e4270085e96d993ee85c927f Mon Sep 17 00:00:00 2001 From: Maykel Arias Torres Date: Fri, 29 Nov 2019 23:05:14 -0500 Subject: [PATCH 8/9] [Makefile] refs #256 Correcting parse --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 62c6200c..c9cea1df 100644 --- a/Makefile +++ b/Makefile @@ -212,9 +212,9 @@ install-linters: ## Install linters go get -u github.com/FiloSottile/vendorcheck cat ./.travis/install-golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.21.0 -install-coveralls: +install-coveralls: ## Install coveralls go get golang.org/x/tools/cmd/cover - go get github.com/mattn/goveralls + go get github.com/mattn/goveralls lint: ## Run linters. Use make install-linters first. # src needs separate linting rules From 2090d117a0b6a830bed6927f0003c6f13d266da9 Mon Sep 17 00:00:00 2001 From: Maykel Arias Torres Date: Sat, 30 Nov 2019 10:58:21 -0500 Subject: [PATCH 9/9] [Makefile] refs #256 Added all test in coveralls --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c9cea1df..d61e487c 100644 --- a/Makefile +++ b/Makefile @@ -200,8 +200,12 @@ test-sky-launch-html-cover: go tool cover -html=$(COVERAGEFILE) -o $(COVERAGEHTML) test-cover-travis: - go test -covermode=count -coverprofile=coverage.out -timeout 30s github.com/fibercrypto/FiberCryptoWallet/src/util - $(HOME)/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken 1zkcSxi8TkcxpL2zTQOK9G5FFoVgWjceP + go test -covermode=count -coverprofile=$(COVERAGEFILE) -timeout 30s github.com/fibercrypto/FiberCryptoWallet/src/util + $(HOME)/gopath/bin/goveralls -coverprofile=$(COVERAGEFILE) -service=travis-ci -repotoken 1zkcSxi8TkcxpL2zTQOK9G5FFoVgWjceP + go test -coverprofile=$(COVERAGEFILE) -timeout 30s github.com/fibercrypto/FiberCryptoWallet/src/coin/skycoin/models + $(HOME)/gopath/bin/goveralls -coverprofile=$(COVERAGEFILE) -service=travis-ci -repotoken 1zkcSxi8TkcxpL2zTQOK9G5FFoVgWjceP + go test -cover -covermode=count -coverprofile=$(COVERAGEFILE) -timeout 30s github.com/fibercrypto/FiberCryptoWallet/src/coin/skycoin + $(HOME)/gopath/bin/goveralls -coverprofile=$(COVERAGEFILE) -service=travis-ci -repotoken 1zkcSxi8TkcxpL2zTQOK9G5FFoVgWjceP test-cover: clean-test test-sky-launch-html-cover ## Show more details of test coverage