Systray launcher

.gitignore

@@ -37,11 +37,9 @@ pkg/visor/foo/
 go.mod-e
 
 # goreleaser and frontend builds
-dist
-
-# release
 *.deb
-
+/sysroot
 static/skywire-manager-src/dist/*
-
-/visor/
+/visor
+/dist-linux
+/dist

.goreleaser.yml

@@ -11,72 +11,124 @@ release:
 
   draft: true
 
-before:
-  hooks:
-    - go mod tidy
+#before:
+#  hooks:
+#    - make tidy
 builds:
-  - id: skywire-visor
+  - id: skywire-visor-darwin-amd64
     binary: skywire-visor
     goos:
-      - linux
       - darwin
     goarch:
       - amd64
-      - 386
+    main: ./cmd/skywire-visor/
+    env:
+      - CGO_ENABLED=1
+      - CC=o64-clang
+      - CXX=o64-clang++
+    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++
+    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/
+    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/
+    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
-    ignore:
-      - goos: darwin
-        goarch: 386
-      - goos: darwin
-        goarch: arm64
     env:
-      - CGO_ENABLED=0
+      - 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/
     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
-      - 386
       - arm64
       - arm
     goarm:
       - 6
       - 7
     ignore:
       - goos: darwin
-        goarch: 386
-      - goos: darwin
-        goarch: arm64
+        goarch: arm
     env:
       - CGO_ENABLED=0
     main: ./cmd/skywire-cli/
     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
-      - 386
       - arm64
       - arm
     goarm:
       - 6
       - 7
     ignore:
       - goos: darwin
-        goarch: 386
-      - goos: darwin
-        goarch: arm64
+        goarch: arm
     env:
       - CGO_ENABLED=0
     main: ./cmd/apps/skychat/
@@ -88,17 +140,14 @@ builds:
       - darwin
     goarch:
       - amd64
-      - 386
       - arm64
       - arm
     goarm:
       - 6
       - 7
     ignore:
       - goos: darwin
-        goarch: 386
-      - goos: darwin
-        goarch: arm64
+        goarch: arm
     env:
       - CGO_ENABLED=0
     main: ./cmd/apps/skysocks/
@@ -110,17 +159,14 @@ builds:
       - darwin
     goarch:
       - amd64
-      - 386
       - arm64
       - arm
     goarm:
       - 6
       - 7
     ignore:
       - goos: darwin
-        goarch: 386
-      - goos: darwin
-        goarch: arm64
+        goarch: arm
     env:
       - CGO_ENABLED=0
     main: ./cmd/apps/skysocks-client/
@@ -132,17 +178,14 @@ builds:
       - darwin
     goarch:
       - amd64
-      - 386
       - arm64
       - arm
     goarm:
       - 6
       - 7
     ignore:
       - goos: darwin
-        goarch: 386
-      - goos: darwin
-        goarch: arm64
+        goarch: arm
     env:
       - CGO_ENABLED=0
     main: ./cmd/apps/vpn-server/
@@ -154,32 +197,29 @@ builds:
       - darwin
     goarch:
       - amd64
-      - 386
       - arm64
       - arm
     goarm:
       - 6
       - 7
     ignore:
       - goos: darwin
-        goarch: 386
-      - goos: darwin
-        goarch: arm64
+        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}}
 archives:
   - format: tar.gz
     wrap_in_directory: false
-    name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
+    name_template: 'skywire-{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
 checksum:
-  name_template: 'checksums.txt'
+  name_template: 'checksums-linux.txt'
 snapshot:
   name_template: "{{ .Tag }}-next"
 changelog:
   sort: asc
   filters:
     exclude:
-    - '^docs:'
-    - '^test:'
+      - '^docs:'
+      - '^test:'

.travis.yml

@@ -14,6 +14,12 @@ addons:
     packages:
       # For building MUSL static builds on Linux.
       - musl-tools
+      - libgtk-3-dev
+      - libappindicator3-dev
+      #- gcc-mingw-w64-i686
+      #- g++-mingw-w64-i686
+      #- binutils-mingw-w64-i686
+      #- libsnmp-dev
 
 matrix:
   include:
@@ -39,6 +45,7 @@ script:
   - make install-deps-ui
   - make lint-ui
   - make build-ui
+  - make snapshot
 
 deploy:
   - provider: script

Makefile

@@ -6,7 +6,9 @@
 .PHONY : docker-image docker-clean docker-network
 .PHONY : docker-apps docker-bin docker-volume
 .PHONY : docker-run docker-stop
+.PHONY : sysroot sysroot-clean
 
+SHELL := /bin/bash
 VERSION := $(shell git describe)
 #VERSION := v0.1.0 # for debugging updater
 
@@ -19,6 +21,7 @@ DMSG_BASE := github.com/skycoin/dmsg
 OPTS?=GO111MODULE=on
 STATIC_OPTS?= $(OPTS) CC=musl-gcc
 MANAGER_UI_DIR = static/skywire-manager-src
+GO_BUILDER_VERSION=v1.16.4
 MANAGER_UI_BUILT_DIR=cmd/skywire-visor/static
 
 TEST_OPTS:=-cover -timeout=5m -mod=vendor
@@ -77,6 +80,9 @@ lint: ## Run linters. Use make install-linters first
 	${OPTS} golangci-lint run -c .golangci.yml ./...
 	# The govet version in golangci-lint is out of date and has spurious warnings, run it separately
 
+lint-ci:
+	${OPTS} golangci-lint run --build-tags=musl -c .golangci.yml ./...
+
 lint-extra: ## Run linters with extra checks.
 	${OPTS} golangci-lint run --no-config --enable-all ./...
 	# The govet version in golangci-lint is out of date and has spurious warnings, run it separately
@@ -104,6 +110,30 @@ format: tidy ## Formats the code. Must have goimports and goimports-reviser inst
 dep: tidy ## Sorts dependencies
 	${OPTS} go mod vendor -v
 
+snapshot: sysroot ## create snapshot release
+	docker run --rm --privileged \
+		-v $(CURDIR):/go/src/github.com/skycoin/skywire \
+		-v /var/run/docker.sock:/var/run/docker.sock \
+		-v $(GOPATH)/src:/go/src \
+		-v $(CURDIR)/sysroot:/sysroot \
+		-w /go/src/github.com/skycoin/skywire \
+		alexadhyatma/golang-cross:$(GO_BUILDER_VERSION) --snapshot --skip-publish --rm-dist
+
+snapshot-clean: ## Cleans snapshot / release
+	rm -rf ./dist
+
+sysroot:
+	mkdir -p ./sysroot
+	@echo "getting sysroot for cross compilation"
+	if [[ ! -f /tmp/snapshot-05-12-2021.tar.gz ]]; then \
+  		curl -L -o /tmp/snapshot-05-12-2021.tar.gz "https://alexadhy-git.s3-ap-southeast-1.amazonaws.com/snapshot-05-12-2021.tar.gz"; \
+	fi
+	tar xf /tmp/snapshot-05-12-2021.tar.gz -C ./sysroot/
+
+sysroot-clean:
+	@rm -rf ./sysroot
+	@rm -rf /tmp/sysroot-git
+
 host-apps: ## Build app
 	${OPTS} go build ${BUILD_OPTS} -o ./apps/skychat ./cmd/apps/skychat
 	${OPTS} go build ${BUILD_OPTS} -o ./apps/skysocks ./cmd/apps/skysocks
@@ -138,8 +168,14 @@ build-deploy: ## Build for deployment Docker images
 	${OPTS} go build ${BUILD_OPTS_DEPLOY} -o /release/apps/skysocks ./cmd/apps/skysocks
 	${OPTS} go build ${BUILD_OPTS_DEPLOY} -o /release/apps/skysocks-client ./cmd/apps/skysocks-client
 
-github-release: ## Create a GitHub release
-	goreleaser --rm-dist
+github-release: sysroot ## Create a GitHub release
+	docker run --rm --privileged \
+		-v $(CURDIR):/go/src/github.com/skycoin/skywire \
+		-v /var/run/docker.sock:/var/run/docker.sock \
+		-v $(GOPATH)/src:/go/src \
+		-v $(CURDIR)/sysroot:/sysroot \
+		-w /go/src/github.com/skycoin/skywire \
+		alexadhyatma/golang-cross:$(GO_BUILDER_VERSION) --rm-dist
 
 # Manager UI
 install-deps-ui:  ## Install the UI dependencies