merge develop ; fix merge conflicts

skycoin · Dec 14, 2023 · ed0c9a8 · ed0c9a8
2 parents 0e2d975 + ee0160c
commit ed0c9a8
Show file tree

Hide file tree

Showing 980 changed files with 392,718 additions and 2,272 deletions.
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.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
+        username: ${{ secrets.USERNAME }}
+        password: ${{ secrets.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: |
@@ -46,7 +46,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
         shell: pwsh
@@ -57,4 +57,4 @@ jobs:
       - name: Releasing
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: make github-release-windows
+        run: make github-release-windows
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,48 +6,50 @@ 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.50.1
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.52.1
           go mod vendor
       - name: Checking Format and Testing
         run: make check
       - name: Build
         run: make build
 
   darwin:
+    needs: linux
     runs-on: macos-latest
     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.50.1
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.52.1
           go mod vendor
       - name: Checking Format and Testing
         run: make check
       - name: Build
         run: make build
 
   windows:
+    needs: linux
     runs-on: windows-latest
     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.50.1
+          go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.1
           go mod vendor
       - name: Testing
         run:  |
           set GO111MODULE=on
           make test-windows
       - name: Build
-        run: make build-windows
+        run: make build-windows
diff --git a/.goreleaser-darwin.yml b/.goreleaser-darwin.yml
@@ -20,11 +20,17 @@ common_flags: >
   -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}}
   -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}
 
-common_build: &common_build
-  goos:
-    - darwin
-  main: ./cmd/{{ .name }}/
-  ldflags: *common_flags
+  - id: dmsgcurl
+    binary: dmsgcurl
+    goos:
+      - darwin
+    goarch:
+      - arm64
+      - amd64
+    env:
+      - CGO_ENABLED=0
+    main: ./cmd/dmsgcurl/
+    ldflags: -s -w -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}}
 
 targets:
   - name: dmsg-discovery
@@ -68,12 +74,31 @@ builds: &builds
     <<: *common_build
   {{ end }}
 
+  - id: dmsgweb
+    binary: dmsgweb
+    goos:
+      - darwin
+    goarch:
+      - arm64
+      - amd64
+    env:
+      - CGO_ENABLED=0
+    main: ./cmd/dmsgweb/
+    ldflags: -s -w -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}}
+
 archives:
   - id: archive
     format: tar.gz
     wrap_in_directory: false
     name_template: 'dmsg-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
-    builds: *builds
+    builds:
+      - dmsg-discovery
+      - dmsg-server
+      - dmsgpty-ui
+      - dmsgpty-host
+      - dmsgcurl
+      - dmsgpty-cli
+      - dmsgweb
     allow_different_binary_count: true
 
 checksum: