Merge pull request #746 from skycoin/develop

v0.21.1
skycoin · Dec 15, 2017 · 4a11cd3 · 4a11cd3
2 parents bf49bf9 + 2b1a190
commit 4a11cd3
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 8 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -52,6 +52,7 @@ deploy:
   folder: wallet
   artifact: published
   unzip: true
+  set_public: true
   on:
     branch: master
 

diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ sudo: required
 dist: trusty
 language: go
 go:
-- 1.9
+- 1.9.x
 
 env:
   global:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.21.1] - 2017-12-14
+
+### Fixed
+
+- Fix blank page issue in windows gui wallet, which was caused by misusing the flag of -download-peers-list in electron.
+
+
 ## [0.21.0] - 2017-12-10
 
 ### Added
@@ -155,6 +162,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - #350 Wallet name always 'undefined' after loading wallet from seed
 
 [Unreleased]: https://github.com/skycoin/skycoin/compare/master...develop
+[0.21.1]: https://github.com/skycoin/skycoin/compare/v0.21.0...v0.21.1
 [0.21.0]: https://github.com/skycoin/skycoin/compare/v0.20.4...v0.21.0
 [0.20.4]: https://github.com/skycoin/skycoin/compare/v0.20.3...v0.20.4
 [0.20.3]: https://github.com/skycoin/skycoin/compare/v0.20.2...v0.20.3

diff --git a/ci-scripts/build-wallet.sh b/ci-scripts/build-wallet.sh
@@ -3,7 +3,7 @@
 echo "start to build wallets..."
 pushd "electron"
 yarn
-if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./build.sh 'linux/amd64' ;fi
+if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./build.sh 'linux/amd64 linux/arm' ;fi
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./build.sh 'darwin/amd64' ;fi
 ls release/
 popd
diff --git a/cmd/skycoin/skycoin.go b/cmd/skycoin/skycoin.go
@@ -31,7 +31,7 @@ import (
 
 var (
 	// Version node version which will be set when build wallet by LDFLAGS
-	Version = "0.21.0"
+	Version = "0.21.1"
 	// Commit id
 	Commit = ""
 

diff --git a/electron/package.json b/electron/package.json
@@ -3,7 +3,7 @@
     "productName": "Skycoin",
     "author": "skycoin",
     "main": "src/electron-main.js",
-    "version": "0.21.0",
+    "version": "0.21.1",
     "description": "skycoin wallet",
     "license": "MIT",
     "build": {

diff --git a/electron/skycoin/current-skycoin.json b/electron/skycoin/current-skycoin.json
@@ -1 +1 @@
-versionData='{     "version": "0.21.0" }';
+versionData='{     "version": "0.21.1" }';
diff --git a/electron/src/electron-main.js b/electron/src/electron-main.js
@@ -70,7 +70,7 @@ function startSkycoin() {
     '-gui-dir=' + path.dirname(exe),
     '-color-log=false', // must be disabled or web interface detection
     '-logtofile=true',
-    '-download-peers-list=true'
+    '-download-peerlist=true'
     // will break
     // broken (automatically generated certs do not work):
     // '-web-interface-https=true',

diff --git a/src/gui/static/dist/current-skycoin.json b/src/gui/static/dist/current-skycoin.json
@@ -1 +1 @@
-versionData='{     "version": "0.21.0" }';
+versionData='{     "version": "0.21.1" }';
diff --git a/src/gui/static/src/current-skycoin.json b/src/gui/static/src/current-skycoin.json
@@ -1 +1 @@
-versionData='{     "version": "0.21.0" }';
+versionData='{     "version": "0.21.1" }';
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ sudo: required @@
     dist: trusty
     language: go
     go:
-    - 1.9
+    - 1.9.x
     env:
       global:
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		versionData='{ "version": "0.21.0" }';
		versionData='{ "version": "0.21.1" }';