Merge branch 'develop' into update-angular

skycoin · Sep 9, 2021 · 108b764 · 108b764
2 parents de28155 + ffd242b
commit 108b764
Show file tree

Hide file tree

Showing 264 changed files with 29,267 additions and 2,216 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,11 +37,10 @@ pkg/visor/foo/
 go.mod-e
 
 # goreleaser and frontend builds
-dist
-
-# release
 *.deb
-
+/sysroot
 static/skywire-manager-src/dist/*
-
-/visor/
+/visor
+/dist-linux
+/dist
+Char
diff --git a/.goreleaser-systray.yml b/.goreleaser-systray.yml
@@ -0,0 +1,246 @@
+# 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
+
+  draft: true
+
+#before:
+#  hooks:
+#    - make tidy
+builds:
+  - id: skywire-visor-darwin-amd64
+    binary: skywire-visor
+    goos:
+      - darwin
+    goarch:
+      - amd64
+    main: ./cmd/skywire-visor/
+    env:
+      - CGO_ENABLED=1
+      - CC=o64-clang
+      - CXX=o64-clang++
+    flags:
+      - -tags='systray'
+    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-visor-darwin-arm64
+    binary: skywire-visor
+    goos:
+      - darwin
+    goarch:
+      - arm64
+    main: ./cmd/skywire-visor/
+    env:
+      - CGO_ENABLED=1
+      - CC=oa64-clang
+      - CXX=oa64-clang++
+    flags:
+      - -tags='systray'
+    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-visor-linux-arm64
+    binary: skywire-visor
+    goos:
+      - linux
+    goarch:
+      - arm64
+    env:
+      - CGO_ENABLED=1
+      - CC=aarch64-linux-gnu-gcc
+      - CXX=aarch64-linux-gnu-g++
+      - CGO_FLAGS=--sysroot=/sysroot/arm64
+      - CGO_LDFLAGS=--sysroot=/sysroot/arm64
+      - PKG_CONFIG_SYSROOT_DIR=/sysroot/arm64
+      - PKG_CONFIG_PATH=/sysroot/arm64/usr/lib/aarch64-linux-gnu/pkgconfig:/sysroot/arm64/usr/lib/pkgconfig:/sysroot/arm64/usr/share/pkgconfig
+    main: ./cmd/skywire-visor/
+    flags:
+      - -tags='systray'
+    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-visor-linux-amd64
+    binary: skywire-visor
+    goos:
+      - linux
+    goarch:
+      - amd64
+    env:
+      - CGO_ENABLED=1
+      - CC=gcc
+      - CXX=g++
+      - CGO_LDFLAGS=--sysroot=/sysroot/amd64
+      - PKG_CONFIG_SYSROOT_DIR=/sysroot/amd64
+      - PKG_CONFIG_PATH=/sysroot/amd64/usr/lib/x86_64-linux-gnu/pkgconfig:/sysroot/amd64/usr/lib/pkgconfig:/sysroot/amd64/usr/share/pkgconfig
+    main: ./cmd/skywire-visor/
+    flags:
+      - -tags='systray'
+    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-visor-linux-armhf
+    binary: skywire-visor
+    goos:
+      - linux
+    goarch:
+      - arm
+    goarm:
+      - 6
+      - 7
+    env:
+      - CGO_ENABLED=1
+      - CC=arm-linux-gnueabihf-gcc
+      - CXX=arm-linux-gnueabihf-g++
+      - CGO_FLAGS=--sysroot=/sysroot/armhf
+      - CGO_LDFLAGS=--sysroot=/sysroot/armhf
+      - PKG_CONFIG_SYSROOT_DIR=/sysroot/armhf
+      - PKG_CONFIG_PATH=/sysroot/armhf/usr/lib/arm-linux-gnueabihf/pkgconfig:/sysroot/armhf/usr/lib/pkgconfig:/sysroot/armhf/usr/share/pkgconfig
+    main: ./cmd/skywire-visor/
+    flags:
+      - -tags='systray'
+    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:
+      - linux
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+      - arm
+    goarm:
+      - 6
+      - 7
+    ignore:
+      - goos: darwin
+        goarch: arm
+    env:
+      - CGO_ENABLED=0
+    main: ./cmd/skywire-cli/
+    flags:
+      - -tags='systray'
+    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:
+      - linux
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+      - arm
+    goarm:
+      - 6
+      - 7
+    ignore:
+      - goos: darwin
+        goarch: arm
+    env:
+      - CGO_ENABLED=0
+    main: ./cmd/apps/skychat/
+    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:
+      - linux
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+      - arm
+    goarm:
+      - 6
+      - 7
+    ignore:
+      - goos: darwin
+        goarch: arm
+    env:
+      - CGO_ENABLED=0
+    main: ./cmd/apps/skysocks/
+    flags:
+      - -tags='systray'
+    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:
+      - linux
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+      - arm
+    goarm:
+      - 6
+      - 7
+    ignore:
+      - goos: darwin
+        goarch: arm
+    env:
+      - CGO_ENABLED=0
+    main: ./cmd/apps/skysocks-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}}
+    flags:
+      - -tags='systray'
+  - id: vpn-server
+    binary: apps/vpn-server
+    goos:
+      - linux
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+      - arm
+    goarm:
+      - 6
+      - 7
+    ignore:
+      - goos: darwin
+        goarch: arm
+    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}}
+    flags:
+      - -tags='systray'
+  - id: vpn-client
+    binary: apps/vpn-client
+    goos:
+      - linux
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+      - arm
+    goarm:
+      - 6
+      - 7
+    ignore:
+      - goos: darwin
+        goarch: arm
+    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}}
+    flags:
+      - -tags='systray'
+archives:
+  - format: tar.gz
+    wrap_in_directory: false
+    name_template: 'skywire-systray-v{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
+checksum:
+  name_template: 'checksums-linux.txt'
+snapshot:
+  name_template: "{{ .Tag }}-next"
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - '^docs:'
+      - '^test:'
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -31,12 +31,11 @@ builds:
     ignore:
       - goos: darwin
         goarch: 386
-      - goos: darwin
-        goarch: arm64
     env:
       - CGO_ENABLED=0
     main: ./cmd/skywire-visor/
     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:
@@ -53,8 +52,6 @@ builds:
     ignore:
       - goos: darwin
         goarch: 386
-      - goos: darwin
-        goarch: arm64
     env:
       - CGO_ENABLED=0
     main: ./cmd/skywire-cli/
@@ -75,8 +72,6 @@ builds:
     ignore:
       - goos: darwin
         goarch: 386
-      - goos: darwin
-        goarch: arm64
     env:
       - CGO_ENABLED=0
     main: ./cmd/apps/skychat/
@@ -97,8 +92,6 @@ builds:
     ignore:
       - goos: darwin
         goarch: 386
-      - goos: darwin
-        goarch: arm64
     env:
       - CGO_ENABLED=0
     main: ./cmd/apps/skysocks/
@@ -119,8 +112,6 @@ builds:
     ignore:
       - goos: darwin
         goarch: 386
-      - goos: darwin
-        goarch: arm64
     env:
       - CGO_ENABLED=0
     main: ./cmd/apps/skysocks-client/
@@ -141,8 +132,6 @@ builds:
     ignore:
       - goos: darwin
         goarch: 386
-      - goos: darwin
-        goarch: arm64
     env:
       - CGO_ENABLED=0
     main: ./cmd/apps/vpn-server/
@@ -163,8 +152,6 @@ builds:
     ignore:
       - goos: darwin
         goarch: 386
-      - goos: darwin
-        goarch: arm64
     env:
       - CGO_ENABLED=0
     main: ./cmd/apps/vpn-client/
@@ -181,5 +168,5 @@ changelog:
   sort: asc
   filters:
     exclude:
-    - '^docs:'
-    - '^test:'
+      - '^docs:'
+      - '^test:'
diff --git a/.travis.yml b/.travis.yml
@@ -9,12 +9,6 @@ dist: xenial
 services:
   - docker
 
-addons:
-  apt:
-    packages:
-      # For building MUSL static builds on Linux.
-      - musl-tools
-
 matrix:
   include:
     - os: linux
@@ -25,20 +19,21 @@ matrix:
 
 before_install:
   - nvm install 14.15
+  - curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sh
+  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.42.0
 
 install:
-  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin v1.40.1
   - make dep
 
 before_script:
   - ci_scripts/create-ip-aliases.sh
 
 script:
-  - make build
   - make check
   - make install-deps-ui
   - make lint-ui
   - make build-ui
+  - make build
 
 deploy:
   - provider: script
@@ -51,4 +46,7 @@ deploy:
     on:
       branch: develop
       condition: $TRAVIS_PULL_REQUEST = false
-
+  - provider: script
+    script: make github-release
+    on:
+      tags: true