Skip to content

Commit 6655934

Browse files
chore(golang): Upgrade to 1.16.5 (#26)
* chore(golang): Upgrade to 1.16.5
1 parent c709868 commit 6655934

File tree

4 files changed

+3
-17
lines changed

4 files changed

+3
-17
lines changed

.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.15.6
1+
1.16.5

Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# any Go projects at Vungle.
33
#
44
# Tag: vungle/golang[:<go-semver>]; e.g. vungle/golang:1.5, vungle/golang:1.5.2.
5-
FROM golang:1.15.6
5+
FROM golang:1.16.5
66

77
# OUTDIR specifies a directory in which projects can create output files so that
88
# these output files can be consumed by other processes. Downstream projects can
@@ -23,7 +23,6 @@ RUN go get -u \
2323
github.com/wadey/gocovmerge \
2424
golang.org/x/lint/golint \
2525
golang.org/x/tools/cmd/goimports \
26-
github.com/golang/dep/cmd/dep \
2726
&& rm -rf $GOPATH/src/* && rm -rf $GOPATH/pkg/*
2827

2928
ENV GLIDE_VERSION v0.12.3

Dockerfile.alpine

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# any Go projects at Vungle.
33
#
44
# Tag: vungle/golang[:<go-semver>-alpine]; e.g. vungle/golang:1.5-alpine, vungle/golang:1.5.2-alpine.
5-
FROM golang:1.15.6-alpine
5+
FROM golang:1.16.5-alpine
66

77
RUN apk add -q --update \
88
&& apk add -q \
@@ -30,7 +30,6 @@ RUN go get -u \
3030
github.com/wadey/gocovmerge \
3131
golang.org/x/lint/golint \
3232
golang.org/x/tools/cmd/goimports \
33-
github.com/golang/dep/cmd/dep \
3433
&& rm -rf $GOPATH/src/* && rm -rf $GOPATH/pkg/*
3534

3635
ENV GLIDE_VERSION v0.12.1

test/mustcompile/mustcompile.go

-12
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"flag"
55
"fmt"
66
"log"
7-
"os/exec"
87
"runtime"
98
"strings"
109
)
@@ -22,10 +21,6 @@ func main() {
2221
log.Fatal(err)
2322
}
2423

25-
if err := verifyInstalledTools(); err != nil {
26-
log.Fatal(err)
27-
}
28-
2924
fmt.Println("Pass!")
3025
}
3126

@@ -41,10 +36,3 @@ func verifyGoVersion(version string) error {
4136

4237
return nil
4338
}
44-
45-
func verifyInstalledTools() error {
46-
// Check `dep version`
47-
cmd := exec.Command("dep", "version")
48-
_, err := cmd.Output()
49-
return err
50-
}

0 commit comments

Comments
 (0)