mirror of
https://github.com/strukturag/nextcloud-spreed-signaling
synced 2024-06-01 13:32:17 +02:00
Merge pull request #209 from strukturag/ci-golang-1.18
CI: Also test with Golang 1.18
This commit is contained in:
commit
57eb2388ca
1
.github/workflows/test.yml
vendored
1
.github/workflows/test.yml
vendored
|
@ -18,6 +18,7 @@ jobs:
|
||||||
- "1.15"
|
- "1.15"
|
||||||
- "1.16"
|
- "1.16"
|
||||||
- "1.17"
|
- "1.17"
|
||||||
|
- "1.18"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
|
4
Makefile
4
Makefile
|
@ -5,6 +5,7 @@ GOPATH := "$(CURDIR)/vendor:$(CURDIR)"
|
||||||
GOFMT := "$(shell dirname "$(GO)")/gofmt"
|
GOFMT := "$(shell dirname "$(GO)")/gofmt"
|
||||||
GOOS ?= linux
|
GOOS ?= linux
|
||||||
GOARCH ?= amd64
|
GOARCH ?= amd64
|
||||||
|
GOVERSION := $(shell "$(GO)" env GOVERSION | sed "s|go||" )
|
||||||
BINDIR := "$(CURDIR)/bin"
|
BINDIR := "$(CURDIR)/bin"
|
||||||
VERSION := $(shell "$(CURDIR)/scripts/get-version.sh")
|
VERSION := $(shell "$(CURDIR)/scripts/get-version.sh")
|
||||||
TARVERSION := $(shell "$(CURDIR)/scripts/get-version.sh" --tar)
|
TARVERSION := $(shell "$(CURDIR)/scripts/get-version.sh" --tar)
|
||||||
|
@ -49,6 +50,9 @@ hook:
|
||||||
|
|
||||||
./vendor/bin/easyjson:
|
./vendor/bin/easyjson:
|
||||||
GOPATH=$(GOPATH) $(GO) get -u github.com/mailru/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:
|
continentmap.go:
|
||||||
$(CURDIR)/scripts/get_continent_map.py $@
|
$(CURDIR)/scripts/get_continent_map.py $@
|
||||||
|
|
Loading…
Reference in a new issue