From ff43503cd51eb4b1258edb77f930ec16ce748b0f Mon Sep 17 00:00:00 2001 From: Mohammed Date: Mon, 25 Mar 2024 23:41:35 +0000 Subject: [PATCH 1/4] fix gorelease configs --- .goreleaser-darwin.yml | 106 +++++++++++++++++-------------- .goreleaser-linux.yml | 137 ++++++++++++++++++++++++++++++---------- .goreleaser-windows.yml | 102 +++++++++++++++--------------- Makefile | 6 +- 4 files changed, 214 insertions(+), 137 deletions(-) diff --git a/.goreleaser-darwin.yml b/.goreleaser-darwin.yml index 3d9e1d1a..db4f07b1 100644 --- a/.goreleaser-darwin.yml +++ b/.goreleaser-darwin.yml @@ -2,6 +2,9 @@ # 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: dmsg @@ -12,13 +15,30 @@ before: hooks: - go mod tidy -env: - - CGO_ENABLED=0 +builds: + - id: dmsg-discovery + binary: dmsg-discovery + goos: + - darwin + goarch: + - arm64 + - amd64 + env: + - CGO_ENABLED=1 + main: ./cmd/dmsg-discovery/ + 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}} -common_flags: > - -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}} + - id: dmsg-server + binary: dmsg-server + goos: + - darwin + goarch: + - arm64 + - amd64 + env: + - CGO_ENABLED=0 + main: ./cmd/dmsg-server/ + 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}} - id: dmsgcurl binary: dmsgcurl @@ -32,47 +52,41 @@ common_flags: > 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 - id: discovery - arch: arm64 - - - name: dmsg-server - id: server - arch: arm64 - - - name: dmsgget - id: get - arch: arm64 - - - name: dmsgpost - id: post - arch: arm64 - - - name: dmsghttp - id: http - arch: arm64 - - - name: dmsgpty-ui - id: ui - arch: arm64 - - - name: dmsgpty-cli - id: cli - arch: arm64 + - id: dmsgpty-ui + binary: dmsgpty-ui + goos: + - darwin + goarch: + - arm64 + - amd64 + env: + - CGO_ENABLED=0 + main: ./cmd/dmsgpty-ui/ + 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}} - - name: dmsgpty-host - id: host - arch: arm64 + - id: dmsgpty-host + binary: dmsgpty-host + goos: + - darwin + goarch: + - arm64 + - amd64 + env: + - CGO_ENABLED=0 + main: ./cmd/dmsgpty-host/ + 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}} -builds: &builds - {{ range .Targets }} - - id: {{ .id }}-{{ .arch }} - binary: {{ .name }} + - id: dmsgpty-cli + binary: dmsgpty-cli + goos: + - darwin goarch: - - {{ .arch }} - <<: *common_build - {{ end }} + - arm64 + - amd64 + env: + - CGO_ENABLED=0 + main: ./cmd/dmsgpty-cli/ + 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}} - id: dmsgweb binary: dmsgweb @@ -102,11 +116,9 @@ archives: allow_different_binary_count: true checksum: - name_template: 'checksums.txt' - + name_template: 'checksums.txt' snapshot: name_template: "{{ .Tag }}-next" - changelog: sort: asc filters: diff --git a/.goreleaser-linux.yml b/.goreleaser-linux.yml index dcbdab7d..ce52ac43 100644 --- a/.goreleaser-linux.yml +++ b/.goreleaser-linux.yml @@ -1,56 +1,125 @@ # 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: dmsg - prerelease: false + prerelease: true before: hooks: - go mod tidy -env: - - CGO_ENABLED=1 - - CC=/home/runner/work/dmsg/dmsg/musl-data/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc +builds: -common_flags: > - -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: dmsg-discovery-amd64 + binary: dmsg-discovery + goos: + - linux + goarch: + - amd64 + env: + - CGO_ENABLED=1 + - CC=/home/runner/work/dmsg/dmsg/musl-data/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc + main: ./cmd/dmsg-discovery/ + 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}} -common_build: &common_build - goos: - - linux - main: ./cmd/{{ .name }}/ - ldflags: *common_flags + - id: dmsg-discovery-arm64 + binary: dmsg-discovery + goos: + - linux + goarch: + - arm64 + env: + - CGO_ENABLED=1 + - CC=/home/runner/work/dmsg/dmsg/musl-data/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc + main: ./cmd/dmsg-discovery/ + 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}} -targets: - - name: dmsg-discovery - id: discovery - arch: amd64 + - id: dmsg-discovery-arm + binary: dmsg-discovery + goos: + - linux + goarch: + - arm + goarm: + - 6 + env: + - CGO_ENABLED=1 + - CC=/home/runner/work/dmsg/dmsg/musl-data/arm-linux-musleabi-cross/bin/arm-linux-musleabi-gcc + main: ./cmd/dmsg-discovery/ + 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}} - - name: dmsg-server - id: server - arch: amd64 + - id: dmsg-discovery-armhf + binary: dmsg-discovery + goos: + - linux + goarch: + - arm + goarm: + - 7 + env: + - CGO_ENABLED=1 + - CC=/home/runner/work/dmsg/dmsg/musl-data/arm-linux-musleabihf-cross/bin/arm-linux-musleabihf-gcc + main: ./cmd/dmsg-discovery/ + 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}} - - name: dmsgpty-ui - id: ui - arch: amd64 + - id: dmsg-server-amd64 + binary: dmsg-server + goos: + - linux + goarch: + - amd64 + env: + - CGO_ENABLED=1 + - CC=/home/runner/work/dmsg/dmsg/musl-data/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc + main: ./cmd/dmsg-server/ + 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}} - - name: dmsgpty-cli - id: cli - arch: amd64 + - id: dmsg-server-arm64 + binary: dmsg-server + goos: + - linux + goarch: + - arm64 + env: + - CGO_ENABLED=1 + - CC=/home/runner/work/dmsg/dmsg/musl-data/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc + main: ./cmd/dmsg-server/ + 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}} - - name: dmsgget - id: get - arch: amd64 + - id: dmsg-server-arm + binary: dmsg-server + goos: + - linux + goarch: + - arm + goarm: + - 6 + env: + - CGO_ENABLED=1 + - CC=/home/runner/work/dmsg/dmsg/musl-data/arm-linux-musleabi-cross/bin/arm-linux-musleabi-gcc + main: ./cmd/dmsg-server/ + 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}} - - name: dmsgpost - id: post - arch: amd64 + - id: dmsg-server-armhf + binary: dmsg-server + goos: + - linux + goarch: + - arm + goarm: + - 7 + env: + - CGO_ENABLED=1 + - CC=/home/runner/work/dmsg/dmsg/musl-data/arm-linux-musleabihf-cross/bin/arm-linux-musleabihf-gcc + main: ./cmd/dmsg-server/ + 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: dmsgcurl-amd64 binary: dmsgcurl @@ -367,10 +436,8 @@ archives: checksum: name_template: 'checksums.txt' - snapshot: name_template: "{{ .Tag }}-next" - changelog: sort: asc filters: diff --git a/.goreleaser-windows.yml b/.goreleaser-windows.yml index 5d7370ca..5bc3e61c 100644 --- a/.goreleaser-windows.yml +++ b/.goreleaser-windows.yml @@ -2,18 +2,42 @@ # 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: dmsg - prerelease: false + prerelease: true before: hooks: - go mod tidy +builds: + - id: dmsg-discovery + binary: dmsg-discovery + goos: + - windows + goarch: + - amd64 + - 386 + env: + - CGO_ENABLED=1 + main: ./cmd/dmsg-discovery/ + 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}} -env: - - CGO_ENABLED=0 + - id: dmsg-server + binary: dmsg-server + goos: + - windows + goarch: + - amd64 + - 386 + env: + - CGO_ENABLED=0 + main: ./cmd/dmsg-server/ + 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}} - id: dmsgcurl binary: dmsgcurl @@ -26,7 +50,7 @@ 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}} - + - id: dmsgpty-ui binary: dmsgpty-ui goos: @@ -39,53 +63,29 @@ env: main: ./cmd/dmsgpty-ui/ 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}} -common_build: &common_build - goos: - - windows - main: ./cmd/{{ .name }}/ - ldflags: *common_flags - -targets: - - name: dmsg-discovery - id: discovery - arch: amd64 - - - name: dmsg-server - id: server - arch: amd64 - - - name: dmsgget - id: get - arch: amd64 - - - name: dmsgpost - id: post - arch: amd64 - - - name: dmsghttp - id: http - arch: amd64 - - - name: dmsgpty-ui - id: ui - arch: amd64 - - - name: dmsgpty-cli - id: cli - arch: amd64 - - - name: dmsgpty-host - id: host - arch: amd64 + - id: dmsgpty-cli + binary: dmsgpty-cli + goos: + - windows + goarch: + - amd64 + - 386 + env: + - CGO_ENABLED=0 + main: ./cmd/dmsgpty-cli/ + 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}} -builds: &builds - {{ range .Targets }} - - id: {{ .id }}-{{ .arch }} - binary: {{ .name }} + - id: dmsgpty-host + binary: dmsgpty-host + goos: + - windows goarch: - - {{ .arch }} - <<: *common_build - {{ end }} + - amd64 + - 386 + env: + - CGO_ENABLED=0 + main: ./cmd/dmsgpty-host/ + 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}} - id: dmsgweb binary: dmsgweb @@ -114,11 +114,9 @@ archives: allow_different_binary_count: true checksum: - name_template: 'checksums.txt' - + name_template: 'checksums.txt' snapshot: name_template: "{{ .Tag }}-next" - changelog: sort: asc filters: diff --git a/Makefile b/Makefile index ee3ffd1b..847087aa 100644 --- a/Makefile +++ b/Makefile @@ -120,10 +120,10 @@ github-prepare-release: sed '/^## ${GITHUB_TAG}$$/,/^## .*/!d;//d;/^$$/d' ./CHANGELOG.md > releaseChangelog.md github-release: github-prepare-release - goreleaser --rm-dist --config .goreleaser-linux.yml --release-notes releaseChangelog.md + goreleaser --clean --config .goreleaser-linux.yml --release-notes releaseChangelog.md github-release-darwin: - goreleaser --rm-dist --config .goreleaser-darwin.yml --skip-publish + goreleaser --clean --config .goreleaser-darwin.yml --skip-publish $(eval GITHUB_TAG=$(shell git describe --abbrev=0 --tags)) gh release upload --repo skycoin/dmsg ${GITHUB_TAG} ./dist/dmsg-${GITHUB_TAG}-darwin-amd64.tar.gz gh release upload --repo skycoin/dmsg ${GITHUB_TAG} ./dist/dmsg-${GITHUB_TAG}-darwin-arm64.tar.gz @@ -132,7 +132,7 @@ github-release-darwin: gh release upload --repo skycoin/dmsg ${GITHUB_TAG} --clobber ./checksums.txt github-release-windows: - .\goreleaser\goreleaser.exe --rm-dist --config .goreleaser-windows.yml --skip-publish + .\goreleaser\goreleaser.exe --clean --config .goreleaser-windows.yml --skip-publish $(eval GITHUB_TAG=$(shell powershell git describe --abbrev=0 --tags)) gh release upload --repo skycoin/dmsg ${GITHUB_TAG} ./dist/dmsg-${GITHUB_TAG}-windows-amd64.zip gh release upload --repo skycoin/dmsg ${GITHUB_TAG} ./dist/dmsg-${GITHUB_TAG}-windows-386.zip From f328f0bfc8c51adb0feca488227857cab9fbfcd4 Mon Sep 17 00:00:00 2001 From: Mohammed Date: Mon, 25 Mar 2024 23:44:32 +0000 Subject: [PATCH 2/4] add dmsghttp and dsmg-socks5 to windows gorelease --- .goreleaser-windows.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.goreleaser-windows.yml b/.goreleaser-windows.yml index 5bc3e61c..5b073f80 100644 --- a/.goreleaser-windows.yml +++ b/.goreleaser-windows.yml @@ -98,6 +98,30 @@ builds: - 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}} + + - id: dmsgptyhttp + binary: dmsgptyhttp + goos: + - windows + goarch: + - amd64 + - 386 + env: + - CGO_ENABLED=0 + main: ./cmd/dmsgptyhttp/ + 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}} + + - id: dmsg-socks5 + binary: dmsg-socks5 + goos: + - windows + goarch: + - amd64 + - 386 + env: + - CGO_ENABLED=0 + main: ./cmd/dmsg-socks5/ + 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 @@ -111,6 +135,8 @@ archives: - dmsgpty-cli - dmsgpty-ui - dmsgpty-host + - dmsghttp + - dmsgpty-socks5 allow_different_binary_count: true checksum: From 736654c01f901808d084149ae2f7704426fa51e7 Mon Sep 17 00:00:00 2001 From: Mohammed Date: Mon, 25 Mar 2024 23:47:52 +0000 Subject: [PATCH 3/4] add dmsghttp and dmsg-socks5 to linux goreleaser --- .goreleaser-linux.yml | 112 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/.goreleaser-linux.yml b/.goreleaser-linux.yml index ce52ac43..0898fdf6 100644 --- a/.goreleaser-linux.yml +++ b/.goreleaser-linux.yml @@ -381,6 +381,110 @@ builds: main: ./cmd/dmsgweb/ 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: dmsghttp-amd64 + binary: dmsghttp + goos: + - linux + goarch: + - amd64 + env: + - CGO_ENABLED=1 + - CC=/home/runner/work/dmsg/dmsg/musl-data/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc + main: ./cmd/dmsghttp/ + 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: dmsghttp-arm64 + binary: dmsghttp + goos: + - linux + goarch: + - arm64 + env: + - CGO_ENABLED=1 + - CC=/home/runner/work/dmsg/dmsg/musl-data/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc + main: ./cmd/dmsghttp/ + 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: dmsghttp-arm + binary: dmsghttp + goos: + - linux + goarch: + - arm + goarm: + - 6 + env: + - CGO_ENABLED=1 + - CC=/home/runner/work/dmsg/dmsg/musl-data/arm-linux-musleabi-cross/bin/arm-linux-musleabi-gcc + main: ./cmd/dmsghttp/ + 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: dmsghttp-armhf + binary: dmsghttp + goos: + - linux + goarch: + - arm + goarm: + - 7 + env: + - CGO_ENABLED=1 + - CC=/home/runner/work/dmsg/dmsg/musl-data/arm-linux-musleabihf-cross/bin/arm-linux-musleabihf-gcc + main: ./cmd/dmsghttp/ + 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: dmsg-socks5-amd64 + binary: dmsg-socks5 + goos: + - linux + goarch: + - amd64 + env: + - CGO_ENABLED=1 + - CC=/home/runner/work/dmsg/dmsg/musl-data/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc + main: ./cmd/dmsg-socks5/ + 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: dmsg-socks5-arm64 + binary: dmsg-socks5 + goos: + - linux + goarch: + - arm64 + env: + - CGO_ENABLED=1 + - CC=/home/runner/work/dmsg/dmsg/musl-data/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc + main: ./cmd/dmsg-socks5/ + 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: dmsg-socks5-arm + binary: dmsg-socks5 + goos: + - linux + goarch: + - arm + goarm: + - 6 + env: + - CGO_ENABLED=1 + - CC=/home/runner/work/dmsg/dmsg/musl-data/arm-linux-musleabi-cross/bin/arm-linux-musleabi-gcc + main: ./cmd/dmsg-socks5/ + 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: dmsg-socks5-armhf + binary: dmsg-socks5 + goos: + - linux + goarch: + - arm + goarm: + - 7 + env: + - CGO_ENABLED=1 + - CC=/home/runner/work/dmsg/dmsg/musl-data/arm-linux-musleabihf-cross/bin/arm-linux-musleabihf-gcc + main: ./cmd/dmsg-socks5/ + 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}} + archives: - id: amd64 format: tar.gz @@ -394,6 +498,8 @@ archives: - dmsgcurl-amd64 - dmsgpty-host-amd64 - dmsgweb-amd64 + - dmsghttp-amd64 + - dmsg-socks5-amd64 - id: arm64 format: tar.gz @@ -407,6 +513,8 @@ archives: - dmsgcurl-arm64 - dmsgpty-host-arm64 - dmsgweb-arm64 + - dmsghttp-arm64 + - dmsg-socks5-arm64 - id: arm format: tar.gz @@ -420,6 +528,8 @@ archives: - dmsgcurl-arm - dmsgpty-host-arm - dmsgweb-arm + - dmsghttp-arm + - dmsg-socks5-arm - id: armhf format: tar.gz @@ -433,6 +543,8 @@ archives: - dmsgcurl-armhf - dmsgpty-host-armhf - dmsgweb-armhf + - dmsghttp-armhf + - dmsg-socks5-armhf checksum: name_template: 'checksums.txt' From 30b253e4536173a964659506820c76ce3b913018 Mon Sep 17 00:00:00 2001 From: Mohammed Date: Mon, 25 Mar 2024 23:48:46 +0000 Subject: [PATCH 4/4] add dmsghttp and dmsg-socks5 to darwin goreleaser --- .goreleaser-darwin.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.goreleaser-darwin.yml b/.goreleaser-darwin.yml index db4f07b1..dfb526e0 100644 --- a/.goreleaser-darwin.yml +++ b/.goreleaser-darwin.yml @@ -100,6 +100,30 @@ builds: 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}} + - id: dmsghttp + binary: dmsghttp + goos: + - darwin + goarch: + - arm64 + - amd64 + env: + - CGO_ENABLED=0 + main: ./cmd/dmsghttp/ + 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}} + + - id: dmsg-socks5 + binary: dmsg-socks5 + goos: + - darwin + goarch: + - arm64 + - amd64 + env: + - CGO_ENABLED=0 + main: ./cmd/dmsg-socks5/ + 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 @@ -113,6 +137,8 @@ archives: - dmsgcurl - dmsgpty-cli - dmsgweb + - dmsghttp + - dmsg-socks5 allow_different_binary_count: true checksum: