Skip to content

Commit 3304da9

Browse files
committed
Switch to goreleaser for release purposes
1 parent 466cb9c commit 3304da9

File tree

11 files changed

+47
-27
lines changed

11 files changed

+47
-27
lines changed

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
.vscode
22
/plesk
33
/.plesk
4-
/plesk.exe
5-
/build/*/plesk*
6-
/build/*.tgz
4+
/dist/

.goreleaser.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
project_name: plesk
2+
builds:
3+
- env:
4+
- CGO_ENABLED=0
5+
goos:
6+
- linux
7+
- windows
8+
- darwin
9+
goarch:
10+
- amd64
11+
ldflags:
12+
- -s -w -X main.version={{.Version}} -X main.commit={{.ShortCommit}} -X main.date={{.Date}}
13+
archives:
14+
- name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Os }}"
15+
replacements:
16+
darwin: mac
17+
linux: linux
18+
windows: win
19+
amd64: x86_64
20+
format: tgz
21+
format_overrides:
22+
- goos: windows
23+
format: zip
24+
checksum:
25+
name_template: 'checksums.txt'
26+
snapshot:
27+
name_template: "{{ .Tag }}"

Makefile

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,26 @@
11
# Copyright 1999-2021. Plesk International GmbH.
22

33
OUTFILE=plesk
4-
REVISON:=$(shell git rev-parse --short HEAD)
5-
VERSION:=$(shell cat VERSION)
6-
BUILD_TIME=$(shell date +'%Y-%m-%d_%T')
7-
LDFLAGS=-X main.revision=$(REVISON) -X main.buildTime=$(BUILD_TIME) -X main.version=$(VERSION)
8-
RELEASE_LDFLAGS=$(LDFLAGS) -s -w
4+
COMMIT:=$(shell git rev-parse --short HEAD)
5+
VERSION:=$(shell git describe --abbrev=0 --tags)
6+
DATE=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
7+
LDFLAGS=-X main.commit=$(COMMIT) -X main.date=$(DATE) -X main.version=$(VERSION)
98

109
.PHONY: all build clean test
1110

1211
build: test
1312
go build -ldflags "$(LDFLAGS)"
1413

1514
release: test
16-
GOOS=linux go build -ldflags "$(RELEASE_LDFLAGS)" -o ./build/linux/$(OUTFILE)
17-
tar czf ./build/$(OUTFILE)-v$(VERSION)-linux.tgz --directory=build/linux $(OUTFILE)
18-
GOOS=darwin go build -ldflags "$(RELEASE_LDFLAGS)" -o ./build/mac/$(OUTFILE)
19-
tar czf ./build/$(OUTFILE)-v$(VERSION)-mac.tgz --directory=build/mac $(OUTFILE)
20-
GOOS=windows go build -ldflags "$(RELEASE_LDFLAGS)" -o ./build/win/$(OUTFILE).exe
21-
tar czf ./build/$(OUTFILE)-v$(VERSION)-win.tgz --directory=build/win $(OUTFILE).exe
15+
goreleaser release
2216

2317
run:
2418
go run main.go
2519

2620
clean:
27-
$(RM) $(OUTFILE) ./build/*/$(OUTFILE) ./build/*.tgz
21+
$(RM) $(OUTFILE)
2822

2923
test:
3024
go test -v -cover ./...
3125

32-
all: clean release build
26+
all: clean release build

VERSION

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/linux/.keep

Whitespace-only changes.

build/mac/.keep

Whitespace-only changes.

build/win/.keep

Whitespace-only changes.

cmd/version.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
// Version information
1414
var (
15-
Revision string
15+
Commit string
1616
BuildTime string
1717
Version string
1818
)
@@ -22,7 +22,7 @@ var versionCmd = &cobra.Command{
2222
Short: locales.L.Get("version.description"),
2323
RunE: func(cmd *cobra.Command, args []string) error {
2424
fmt.Println("Client information")
25-
fmt.Printf("Version:\t%s\nRevision:\t%s\nBuild time:\t%s\n", Version, Revision, BuildTime)
25+
fmt.Printf("Version:\t%s\nRevision:\t%s\nBuild time:\t%s\n", Version, Commit, BuildTime)
2626

2727
defaultServerName, err := config.DefaultServer()
2828
if err == nil {

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/jlaffaye/ftp v0.0.0-20210307004419-5d4190119067
1010
github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4
1111
github.com/spf13/cobra v1.1.3
12-
github.com/stretchr/testify v1.7.0 // indirect
12+
github.com/stretchr/testify v1.7.0
1313
golang.org/x/net v0.0.0-20210505214959-0714010a04ed // indirect
1414
golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6 // indirect
1515
golang.org/x/term v0.0.0-20210503060354-a79de5458b56

go.sum

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,10 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW
104104
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
105105
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
106106
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
107+
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
107108
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
108109
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
110+
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
109111
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
110112
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
111113
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -166,7 +168,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
166168
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
167169
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
168170
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
169-
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
170171
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
171172
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
172173
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -296,6 +297,7 @@ google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiq
296297
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
297298
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
298299
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
300+
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
299301
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
300302
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
301303
gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=

0 commit comments

Comments
 (0)