fixes Makefile for Go 1.17 (#34)

bwhaley · Feb 14, 2024 · cfb90d1 · cfb90d1
1 parent 4369ee2
commit cfb90d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,11 +14,11 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.32 # Latest version from https://github.com/golangci/golangci-lint/releases/
+          version: v1.56.1
           args: --enable golint
   test-and-build:
     name: Test and build
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.17
       - name: Vet
         run: go vet -v $(go list ./...)
       - name: Test

diff --git a/Makefile b/Makefile
@@ -12,9 +12,9 @@ ifeq "$(VERSION)" ""
     VERSION="auto-build"
 endif
 
-GOVERSION := $(shell go version | grep 1.15)
+GOVERSION := $(shell go version | grep 1.17)
 ifeq "$(GOVERSION)" ""
-    $(error must be running Go version 1.15.x)
+    $(error must be running Go version 1.17.x)
 endif
 
 ifndef $(GOPATH)
@@ -54,7 +54,7 @@ vendor: $(DEP)
 	$(DEP) ensure
 
 build:
-	go build -i -ldflags "$(GO_LDFLAGS)" -o $(GOPATH)/bin/$(EXECUTABLE) $(PROJECT)
+	go build -ldflags "$(GO_LDFLAGS)" -o $(GOPATH)/bin/$(EXECUTABLE) $(PROJECT)
 build-linux:
 	GOOS=linux GOARCH=amd64 go build -ldflags "$(GO_LDFLAGS)" -o $(GOPATH)/bin/$(EXECUTABLE)-linux-amd64
 build-darwin-amd64: