Merge pull request #556 from skycoin/develop

Merge develop into master

.gitignore

@@ -14,6 +14,8 @@
 /apps/
 /skywire/
 /local*
+/transport_logs
+/dmsgpty
 
 pkg/visor/apps/
 pkg/visor/bar/
@@ -30,10 +32,12 @@ pkg/visor/foo/
 /*.json
 /*.sh
 /*.log
-dmsgpty
 
 # Ignore backup go.mod after running '/ci_scripts/go_mod_replace.sh'.
 go.mod-e
 
-# goreleaser
+# goreleaser and frontend builds
 dist
+
+# release
+*.deb

.golangci.yml

@@ -145,6 +145,8 @@ linters-settings:
     simple: true
     range-loops: true # Report preallocation suggestions on range loops, true by default
     for-loops: false # Report preallocation suggestions on for loops, false by default
+  goimports:
+    local-prefixes: github.com/skycoin/skywire
 
 
 linters:

.goreleaser.yml

@@ -1,5 +1,14 @@
 # This is an example goreleaser.yaml file with some sane defaults.
 # Make sure to check the documentation at http://goreleaser.com
+
+release:
+  # Repo in which the release will be created.
+  # Default is extracted from the origin remote URL or empty if its private hosted.
+  # Note: it can only be one: either github or gitlab or gitea
+  github:
+    owner: skycoin
+    name: skywire
+
 before:
   hooks:
     - go mod tidy
@@ -16,10 +25,13 @@ builds:
       - arm
     goarm:
       - 7
+    ignore:
+      - goos: darwin
+        goarch: 386
     env:
       - CGO_ENABLED=0
     main: ./cmd/skywire-visor/
-    ldflags: -s -w -X github.com/skycoin/skywire/pkg/util/buildinfo.version={{.Version}} -X github.com/skycoin/skywire/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire/pkg/util/buildinfo.date={{.Date}}
+    ldflags: -s -w -X github.com/skycoin/dmsg/buildinfo.version={{.Version}} -X github.com/skycoin/dmsg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/dmsg/buildinfo.date={{.Date}}
   - id: skywire-cli
     binary: skywire-cli
     goos:
@@ -32,10 +44,13 @@ builds:
       - arm
     goarm:
       - 7
+    ignore:
+      - goos: darwin
+        goarch: 386
     env:
       - CGO_ENABLED=0
     main: ./cmd/skywire-cli/
-    ldflags: -s -w -X github.com/skycoin/skywire/pkg/util/buildinfo.version={{.Version}} -X github.com/skycoin/skywire/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire/pkg/util/buildinfo.date={{.Date}}
+    ldflags: -s -w -X github.com/skycoin/dmsg/buildinfo.version={{.Version}} -X github.com/skycoin/dmsg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/dmsg/buildinfo.date={{.Date}}
   - id: hypervisor
     binary: hypervisor
     goos:
@@ -48,10 +63,13 @@ builds:
       - arm
     goarm:
       - 7
+    ignore:
+      - goos: darwin
+        goarch: 386
     env:
       - CGO_ENABLED=0
     main: ./cmd/hypervisor/
-    ldflags: -s -w -X github.com/skycoin/skywire/pkg/util/buildinfo.version={{.Version}} -X github.com/skycoin/skywire/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire/pkg/util/buildinfo.date={{.Date}}
+    ldflags: -s -w -X github.com/skycoin/dmsg/buildinfo.version={{.Version}} -X github.com/skycoin/dmsg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/dmsg/buildinfo.date={{.Date}}
   - id: skychat
     binary: apps/skychat
     goos:
@@ -64,10 +82,13 @@ builds:
       - arm
     goarm:
       - 7
+    ignore:
+      - goos: darwin
+        goarch: 386
     env:
       - CGO_ENABLED=0
     main: ./cmd/apps/skychat/
-    ldflags: -s -w -X github.com/skycoin/skywire/pkg/util/buildinfo.version={{.Version}} -X github.com/skycoin/skywire/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire/pkg/util/buildinfo.date={{.Date}}
+    ldflags: -s -w -X github.com/skycoin/dmsg/buildinfo.version={{.Version}} -X github.com/skycoin/dmsg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/dmsg/buildinfo.date={{.Date}}
   - id: skysocks
     binary: apps/skysocks
     goos:
@@ -80,10 +101,13 @@ builds:
       - arm
     goarm:
       - 7
+    ignore:
+      - goos: darwin
+        goarch: 386
     env:
       - CGO_ENABLED=0
     main: ./cmd/apps/skysocks/
-    ldflags: -s -w -X github.com/skycoin/skywire/pkg/util/buildinfo.version={{.Version}} -X github.com/skycoin/skywire/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire/pkg/util/buildinfo.date={{.Date}}
+    ldflags: -s -w -X github.com/skycoin/dmsg/buildinfo.version={{.Version}} -X github.com/skycoin/dmsg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/dmsg/buildinfo.date={{.Date}}
   - id: skysocks-client
     binary: apps/skysocks-client
     goos:
@@ -96,10 +120,51 @@ builds:
       - arm
     goarm:
       - 7
+    ignore:
+      - goos: darwin
+        goarch: 386
     env:
       - CGO_ENABLED=0
     main: ./cmd/apps/skysocks-client/
-    ldflags: -s -w -X github.com/skycoin/skywire/pkg/util/buildinfo.version={{.Version}} -X github.com/skycoin/skywire/pkg/util/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire/pkg/util/buildinfo.date={{.Date}}
+    ldflags: -s -w -X github.com/skycoin/dmsg/buildinfo.version={{.Version}} -X github.com/skycoin/dmsg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/dmsg/buildinfo.date={{.Date}}
+  - id: vpn-server
+    binary: apps/vpn-server
+    goos:
+      - linux
+      - darwin
+    goarch:
+      - amd64
+      - 386
+      - arm64
+      - arm
+    goarm:
+      - 7
+    ignore:
+      - goos: darwin
+        goarch: 386
+    env:
+      - CGO_ENABLED=0
+    main: ./cmd/apps/vpn-server/
+    ldflags: -s -w -X github.com/skycoin/dmsg/buildinfo.version={{.Version}} -X github.com/skycoin/dmsg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/dmsg/buildinfo.date={{.Date}}
+  - id: vpn-client
+    binary: apps/vpn-client
+    goos:
+      - linux
+      - darwin
+    goarch:
+      - amd64
+      - 386
+      - arm64
+      - arm
+    goarm:
+      - 7
+    ignore:
+      - goos: darwin
+        goarch: 386
+    env:
+      - CGO_ENABLED=0
+    main: ./cmd/apps/vpn-client/
+    ldflags: -s -w -X github.com/skycoin/dmsg/buildinfo.version={{.Version}} -X github.com/skycoin/dmsg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/dmsg/buildinfo.date={{.Date}}
 archives:
   - format: tar.gz
     wrap_in_directory: false

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 go:
-  # - "1.13.x" At minimum the code should run make check on the latest two go versions in the default linux environment provided by Travis.
-  - "1.13.x"
+  # - "1.14.x" At minimum the code should run make check on the latest two go versions in the default linux environment provided by Travis.
+  - "1.14.x"
 
 dist: xenial
 
@@ -11,14 +11,15 @@ matrix:
     - os: osx
       # Do not start osx build for PR
       if: type != pull_request
-      osx_image: xcode8
+      osx_image: xcode8.3
 
 before_install:
   - nvm install 10.16
 
 install:
   - go get -u github.com/FiloSottile/vendorcheck
-  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.22.2
+  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.31.0
+  - make tidy
 
 before_script:
   - ci_scripts/create-ip-aliases.sh
@@ -30,3 +31,4 @@ script:
   - make install-deps-ui
   - make lint-ui
   - make build-ui
+

CHANGELOG.md

@@ -4,22 +4,32 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## 0.2.1 - 2020.04.07
+
+### Changed
+
+- reverted port changes for `skysocks-client`
+
+## 0.2.0 - 2020.04.02
 
 ### Added 
 
-- Retry logic to messaging server for messaging client.
+- added `--retain-keys` flag to `skywire-cli visor gen-config` command
+- added `--secret-key` flag to `skywire-cli visor gen-config` command
+- added hypervisorUI frontend
+- added default values for visor if certain fields of config are empty
 
 ### Fixed
 
-- Fixed channel collision for messaging clients.
+- fixed deployment route finder HTTP request
+- fixed /user endpoint not working when auth is disabled
 
 ### Changed
 
-- Improve readability of Skywire CLI output.
-
-## 0.1.0 - 2019.03.04
+- changed port of hypervisorUI and applications
+- replaced unix sockets for app to visor communication to tcp sockets
+- reverted asynchronous sending of router packets
 
-### Added
+## 0.1.0 - 2020.04.02
 
-- First release of the mainnet Skywire visor and apps for testing.
+First release of Skywire Mainnet.