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

fixes Makefile for Go 1.17 #34

Merged
merged 5 commits into from
Feb 14, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down
Loading