Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix Mac/Windows release issue #1433

Merged
merged 7 commits into from
Jan 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 70 additions & 17 deletions .goreleaser-darwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ builds:
goos:
- darwin
goarch:
- arm64
- amd64
env:
- CGO_ENABLED=0
- CGO_ENABLED=1
main: ./cmd/skywire-visor/
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}} -X github.com/skycoin/skywire/pkg/visor.BuildTag={{.Os}}

Expand All @@ -32,10 +31,7 @@ builds:
goos:
- darwin
goarch:
- arm64
- amd64
env:
- CGO_ENABLED=0
main: ./cmd/skywire-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}}

Expand All @@ -44,10 +40,7 @@ builds:
goos:
- darwin
goarch:
- arm64
- amd64
env:
- CGO_ENABLED=0
main: ./cmd/apps/skychat/
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}}

Expand All @@ -56,10 +49,7 @@ builds:
goos:
- darwin
goarch:
- arm64
- amd64
env:
- CGO_ENABLED=0
main: ./cmd/apps/skysocks/
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}}

Expand All @@ -68,10 +58,7 @@ builds:
goos:
- darwin
goarch:
- arm64
- amd64
env:
- CGO_ENABLED=0
main: ./cmd/apps/skysocks-client/
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}}

Expand All @@ -80,10 +67,61 @@ builds:
goos:
- darwin
goarch:
- arm64
- amd64
env:
- CGO_ENABLED=0
main: ./cmd/apps/vpn-client/
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: skywire-visor-arm64
binary: skywire-visor
goos:
- darwin
goarch:
- arm64
main: ./cmd/skywire-visor/
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}} -X github.com/skycoin/skywire/pkg/visor.BuildTag={{.Os}}

- id: skywire-cli-arm64
binary: skywire-cli
goos:
- darwin
goarch:
- arm64
main: ./cmd/skywire-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: skychat-arm64
binary: apps/skychat
goos:
- darwin
goarch:
- arm64
main: ./cmd/apps/skychat/
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: skysocks-arm64
binary: apps/skysocks
goos:
- darwin
goarch:
- arm64
main: ./cmd/apps/skysocks/
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: skysocks-client-arm64
binary: apps/skysocks-client
goos:
- darwin
goarch:
- arm64
main: ./cmd/apps/skysocks-client/
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: vpn-client-arm64
binary: apps/vpn-client
goos:
- darwin
goarch:
- arm64
main: ./cmd/apps/vpn-client/
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}}

Expand All @@ -102,6 +140,21 @@ archives:
- skychat
- vpn-client
allow_different_binary_count: true

- id: archive-arm64
format: tar.gz
wrap_in_directory: false
name_template: 'skywire-v{{ .Version }}-{{ .Os }}-{{ .Arch }}'
files:
- dmsghttp-config.json
builds:
- skywire-visor-arm64
- skywire-cli-arm64
- skysocks-arm64
- skysocks-client-arm64
- skychat-arm64
- vpn-client-arm64
allow_different_binary_count: true

checksum:
name_template: 'checksums.txt'
Expand Down
2 changes: 1 addition & 1 deletion scripts/win_installer/script.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function BuildInstaller($arch)
$downloadURL = "https://github.com/skycoin/skywire/releases/download/v$version/$filename.zip"
Invoke-WebRequest $downloadURL -o archive.zip -ErrorAction Stop
} else {
$fileName = "skywire-v$version-windows-$arch"
$fileName = "skywire-$version-windows-$arch"
$msiName = "skywire-installer-$version-windows-$arch"
$downloadURL = "https://github.com/skycoin/skywire/releases/download/$version/$filename.zip"
Invoke-WebRequest $downloadURL -o archive.zip
Expand Down