Merge branch 'develop' into fwd-ui

skycoin · Mar 15, 2024 · 669a1a5 · 669a1a5
2 parents e5b125b + 9777a15
commit 669a1a5
Show file tree

Hide file tree

Showing 2,943 changed files with 722,110 additions and 193,315 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -16,8 +16,8 @@ jobs:
     - name: Login to Docker Hub
       uses: docker/login-action@v2
       with:
-        username: ${{ secrets.USERNAME }}
-        password: ${{ secrets.TOKEN }}
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
     - uses: actions/checkout@v3
     - name: deploy to docker
       run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
       - uses: actions/checkout@v3
       - name: Install Requirements
         run: |
@@ -28,7 +28,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
       - uses: actions/checkout@v3
       - name: Install Requirements
         run: |
@@ -48,12 +48,12 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
       - uses: actions/checkout@v3
       - name: Install Requirements
         shell: pwsh
         run: |
-          Invoke-WebRequest "https://github.com/goreleaser/goreleaser/releases/download/v1.8.3/goreleaser_Windows_x86_64.zip" -o goreleaser.zip
+          Invoke-WebRequest "https://github.com/goreleaser/goreleaser/releases/download/v1.8.3/goreleaser_Windows_x86_64.zip" -OutFile goreleaser.zip
           Expand-Archive goreleaser.zip
           choco install make
       - name: Releasing

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,11 +6,11 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
       - uses: actions/checkout@v3
       - name: Install Requirements
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.52.1
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
           make dep
           chmod +x ./ci_scripts/create-ip-aliases.sh
           ./ci_scripts/create-ip-aliases.sh
@@ -25,11 +25,11 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
       - uses: actions/checkout@v3
       - name: Install Requirements
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.52.1
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2
           make dep
           chmod +x ./ci_scripts/create-ip-aliases.sh
           ./ci_scripts/create-ip-aliases.sh
@@ -44,12 +44,12 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
       - uses: actions/checkout@v3
       - name: Install Requirements
         run: |
           choco install make
-          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.1
+          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2
           make dep
       - name: Testing
         run:  |

diff --git a/.gitignore b/.gitignore
@@ -34,6 +34,7 @@ pkg/visor/foo/
 /*-server
 /*.json
 !/dmsghttp-config.json
+!/services-config.json
 /*.sh
 /*.log
 

diff --git a/.golangci.yml b/.golangci.yml
@@ -163,7 +163,6 @@ linters:
     - megacheck
     - misspell
     - nakedret
-    - depguard
   enable-all: false
   disable-all: true
   presets:

diff --git a/.goreleaser-archlinux.yml b/.goreleaser-archlinux.yml
@@ -290,6 +290,7 @@ archives:
     name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
     files:
       - dmsghttp-config.json
+      - services-config.json
     builds:
       - skywire-visor-amd64
       - skywire-cli-amd64
@@ -305,6 +306,7 @@ archives:
     name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
     files:
       - dmsghttp-config.json
+      - services-config.json
     builds:
       - skywire-visor-arm64
       - skywire-cli-arm64
@@ -320,6 +322,7 @@ archives:
     name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
     files:
       - dmsghttp-config.json
+      - services-config.json
     builds:
       - skywire-visor-arm
       - skywire-cli-arm

diff --git a/.goreleaser-darwin.yml b/.goreleaser-darwin.yml
@@ -86,6 +86,7 @@ archives:
     name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
     files:
       - dmsghttp-config.json
+      - services-config.json
     builds:
       - skywire-visor
       - skywire-cli

diff --git a/.goreleaser-linux.yml b/.goreleaser-linux.yml
@@ -17,6 +17,70 @@ before:
     - sed -i '/go conn.handleCall(msg)/c\conn.handleCall(msg)' ./vendor/github.com/godbus/dbus/v5/conn.go
 builds:
 
+  - id: skywire-deployment-amd64
+    binary: skywire
+    goos:
+      - linux
+    goarch:
+      - amd64
+    env:
+      - CGO_ENABLED=1
+      - CC=/home/runner/work/skywire/skywire/musl-data/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc
+    main: ./cmd/skywire-deployment/
+    ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}} -X github.com/skycoin/skywire/pkg/visor.BuildTag={{.Os}}_{{.Arch}}
+
+  - id: skywire-deployment-arm64
+    binary: skywire
+    goos:
+      - linux
+    goarch:
+      - arm64
+    env:
+      - CGO_ENABLED=1
+      - CC=/home/runner/work/skywire/skywire/musl-data/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc
+    main: ./cmd/skywire-deployment/
+    ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}} -X github.com/skycoin/skywire/pkg/visor.BuildTag={{.Os}}_{{.Arch}}
+
+  - id: skywire-deployment-arm
+    binary: skywire
+    goos:
+      - linux
+    goarch:
+      - arm
+    goarm:
+      - 6
+    env:
+      - CGO_ENABLED=1
+      - CC=/home/runner/work/skywire/skywire/musl-data/arm-linux-musleabi-cross/bin/arm-linux-musleabi-gcc
+    main: ./cmd/skywire-deployment/
+    ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}} -X github.com/skycoin/skywire/pkg/visor.BuildTag={{.Os}}_{{.Arch}}
+
+  - id: skywire-deployment-armhf
+    binary: skywire
+    goos:
+      - linux
+    goarch:
+      - arm
+    goarm:
+      - 7
+    env:
+      - CGO_ENABLED=1
+      - CC=/home/runner/work/skywire/skywire/musl-data/arm-linux-musleabihf-cross/bin/arm-linux-musleabihf-gcc
+    main: ./cmd/skywire-deployment/
+    ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}} -X github.com/skycoin/skywire/pkg/visor.BuildTag={{.Os}}_{{.Arch}}
+
+  - id: skywire-deployment-riscv64
+    binary: skywire
+    goos:
+      - linux
+    goarch:
+      - riscv64
+    env:
+      - CGO_ENABLED=1
+      - CC=/home/runner/work/skywire/skywire/musl-data/riscv64-linux-musl-cross/bin/riscv64-linux-musl-gcc
+    main: ./cmd/skywire-deployment/
+    ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}} -X github.com/skycoin/skywire/pkg/visor.BuildTag={{.Os}}_{{.Arch}}
+
   - id: skywire-visor-amd64
     binary: skywire-visor
     goos:
@@ -198,7 +262,7 @@ builds:
     ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
 
   - id: skychat-riscv64
-    binary: skychat
+    binary: apps/skychat
     goos:
       - linux
     goarch:
@@ -262,7 +326,7 @@ builds:
     ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
 
   - id: skysocks-riscv64
-    binary: skysocks
+    binary: apps/skysocks
     goos:
       - linux
     goarch:
@@ -326,7 +390,7 @@ builds:
     ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
 
   - id: skysocks-client-riscv64
-    binary: skysocks-client
+    binary: apps/skysocks-client
     goos:
       - linux
     goarch:
@@ -390,7 +454,7 @@ builds:
     ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
 
   - id: vpn-server-riscv64
-    binary: vpn-server
+    binary: apps/vpn-server
     goos:
       - linux
     goarch:
@@ -454,7 +518,7 @@ builds:
     ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
 
   - id: vpn-client-riscv64
-    binary: vpn-client
+    binary: apps/vpn-client
     goos:
       - linux
     goarch:
@@ -472,6 +536,7 @@ archives:
     name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
     files:
       - dmsghttp-config.json
+      - services-config.json
     builds:
       - skywire-visor-amd64
       - skywire-cli-amd64
@@ -487,6 +552,7 @@ archives:
     name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
     files:
       - dmsghttp-config.json
+      - services-config.json
     builds:
       - skywire-visor-arm64
       - skywire-cli-arm64
@@ -502,6 +568,7 @@ archives:
     name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
     files:
       - dmsghttp-config.json
+      - services-config.json
     builds:
       - skywire-visor-arm
       - skywire-cli-arm
@@ -517,6 +584,7 @@ archives:
     name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}hf'
     files:
       - dmsghttp-config.json
+      - services-config.json
     builds:
       - skywire-visor-armhf
       - skywire-cli-armhf
@@ -532,6 +600,7 @@ archives:
     name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
     files:
       - dmsghttp-config.json
+      - services-config.json
     builds:
       - skywire-visor-riscv64
       - skywire-cli-riscv64
@@ -541,6 +610,56 @@ archives:
       - vpn-server-riscv64
       - vpn-client-riscv64
 
+  - id: deployment-amd64
+    format: tar.gz
+    wrap_in_directory: false
+    name_template: 'skywire-deployment-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
+    files:
+      - dmsghttp-config.json
+      - services-config.json
+    builds:
+      - skywire-deployment-amd64
+
+  - id: deployment-arm64
+    format: tar.gz
+    wrap_in_directory: false
+    name_template: 'skywire-deployment-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
+    files:
+      - dmsghttp-config.json
+      - services-config.json
+    builds:
+      - skywire-deployment-arm64
+
+  - id: deployment-arm
+    format: tar.gz
+    wrap_in_directory: false
+    name_template: 'skywire-deployment-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
+    files:
+      - dmsghttp-config.json
+      - services-config.json
+    builds:
+      - skywire-deployment-arm
+
+  - id: deployment-armhf
+    format: tar.gz
+    wrap_in_directory: false
+    name_template: 'skywire-deployment-v{{ .Version }}-{{ .Os }}-{{ .Arch }}hf'
+    files:
+      - dmsghttp-config.json
+      - services-config.json
+    builds:
+      - skywire-deployment-armhf
+
+  - id: deployment-riscv64
+    format: tar.gz
+    wrap_in_directory: false
+    name_template: 'skywire-deployment-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
+    files:
+      - dmsghttp-config.json
+      - services-config.json
+    builds:
+      - skywire-deployment-riscv64
+
 checksum:
   name_template: 'checksums.txt'
 snapshot: