Skip to content

Commit 717677a

Browse files
marcosbcmarcosbc
committed
Update to Go 1.18
Signed-off-by: Marcos Bjoerkelund <[email protected]>
1 parent 5d849bb commit 717677a

File tree

7 files changed

+14
-59
lines changed

7 files changed

+14
-59
lines changed

‎.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- uses: actions/checkout@v2
2828
- uses: actions/setup-go@v2
2929
with:
30-
go-version: '^1.16.10' # The Go version to download (if necessary) and use.
30+
go-version: '^1.18.2' # The Go version to download (if necessary) and use.
3131
- name: Install Build Dependencies
3232
run: make get-build-deps
3333
- name: Download required modules

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
vendor/
2+
out/

‎Dockerfile

+1-6
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,12 @@
22
#
33
# docker run --rm -i -e WHO=bitnami bitnami/render-template <<<"hello {{WHO}}"
44
#
5-
FROM golang:1.16-stretch as build
5+
FROM golang:1.18-stretch as build
66

77
RUN apt-get update && apt-get install -y --no-install-recommends \
88
git make upx \
99
&& rm -rf /var/lib/apt/lists/*
1010

11-
RUN go get -u \
12-
golang.org/x/lint/golint \
13-
golang.org/x/tools/cmd/goimports \
14-
&& rm -rf $GOPATH/src/* && rm -rf $GOPATH/pkg/*
15-
1611
WORKDIR /go/src/app
1712
COPY . .
1813

‎Makefile

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: test cover all vet lint clean download get-build-deps build
1+
.PHONY: all build clean download get-build-deps vet lint test cover
22

33
TOOL_NAME := render-template
44

@@ -30,16 +30,15 @@ download:
3030

3131
get-build-deps:
3232
@echo "+ Downloading build dependencies"
33-
@go get golang.org/x/tools/cmd/goimports
34-
@go get golang.org/x/lint/golint
33+
@go install honnef.co/go/tools/cmd/staticcheck@latest
3534

3635
vet:
3736
@echo "+ Vet"
3837
@go vet ./...
3938

4039
lint:
4140
@echo "+ Linting package"
42-
@golint .
41+
@staticcheck ./...
4342
$(call fmtcheck, .)
4443

4544
test:

‎cmd.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,5 @@ func (c *RenderTemplateCmd) Execute(args []string) (err error) {
6262

6363
func hasPipedStdin() bool {
6464
stat, _ := os.Stdin.Stat()
65-
if (stat.Mode() & os.ModeCharDevice) == 0 {
66-
return true
67-
}
68-
return false
65+
return (stat.Mode() & os.ModeCharDevice) == 0
6966
}

‎go.mod

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
module github.com/bitnami/render-template
22

3-
go 1.16
3+
go 1.18
44

55
require (
66
github.com/aymerick/raymond v2.0.1+incompatible
77
github.com/bitnami/gonit v0.1.0
8-
github.com/cesanta/errors v0.0.0-20160612174407-5adec772d663 // indirect
9-
github.com/davecgh/go-spew v1.1.1 // indirect
108
github.com/jessevdk/go-flags v1.3.0
119
github.com/juamedgod/cliassert v0.0.0-20180320011200-425256f2bb0b
1210
github.com/mmikulicic/multierror v0.0.0-20170428094957-c1ad6b5ecd26
13-
github.com/pmezard/go-difflib v1.0.0 // indirect
1411
github.com/stretchr/testify v1.2.1
15-
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
16-
golang.org/x/tools v0.1.7 // indirect
12+
)
13+
14+
require (
15+
github.com/cesanta/errors v0.0.0-20160612174407-5adec772d663 // indirect
16+
github.com/davecgh/go-spew v1.1.1 // indirect
17+
github.com/pmezard/go-difflib v1.0.0 // indirect
1718
gopkg.in/yaml.v2 v2.4.0 // indirect
1819
)

‎go.sum

-38
Original file line numberDiff line numberDiff line change
@@ -16,44 +16,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
1616
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1717
github.com/stretchr/testify v1.2.1 h1:52QO5WkIUcHGIR7EnGagH88x1bUzqGXTC5/1bDTUQ7U=
1818
github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
19-
github.com/yuin/goldmark v1.4.0 h1:OtISOGfH6sOWa1/qXqqAiOIAO6Z5J3AEAE18WAq6BiQ=
20-
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
21-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
22-
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
23-
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
24-
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
25-
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
26-
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
27-
golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
28-
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
29-
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
30-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
31-
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI=
32-
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
33-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
34-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
35-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
36-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
37-
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
38-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
39-
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
40-
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e h1:WUoyKPm6nCo1BnNUvPGnFG3T5DUVem42yDJZZ4CNxMA=
41-
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
42-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
43-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
44-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
45-
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
46-
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
47-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
48-
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
49-
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
50-
golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ=
51-
golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
52-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
53-
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
54-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
55-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
56-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
5719
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5820
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
5921
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

0 commit comments

Comments
 (0)