Merge pull request #209 from strukturag/ci-golang-1.18

CI: Also test with Golang 1.18
This commit is contained in:
Joachim Bauch 2022-03-23 11:29:32 +01:00 committed by GitHub
commit 57eb2388ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions

View file

@ -18,6 +18,7 @@ jobs:
- "1.15"
- "1.16"
- "1.17"
- "1.18"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

View file

@ -5,6 +5,7 @@ GOPATH := "$(CURDIR)/vendor:$(CURDIR)"
GOFMT := "$(shell dirname "$(GO)")/gofmt"
GOOS ?= linux
GOARCH ?= amd64
GOVERSION := $(shell "$(GO)" env GOVERSION | sed "s|go||" )
BINDIR := "$(CURDIR)/bin"
VERSION := $(shell "$(CURDIR)/scripts/get-version.sh")
TARVERSION := $(shell "$(CURDIR)/scripts/get-version.sh" --tar)
@ -49,6 +50,9 @@ hook:
./vendor/bin/easyjson:
GOPATH=$(GOPATH) $(GO) get -u github.com/mailru/easyjson/...
@if dpkg --compare-versions "$(GOVERSION)" "ge" "1.17" ; then \
GOPATH=$(GOPATH) $(GO) install github.com/mailru/easyjson/...; \
fi
continentmap.go:
$(CURDIR)/scripts/get_continent_map.py $@