Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update to go1.18
Browse files Browse the repository at this point in the history
tomcz committed Apr 17, 2022
1 parent c20e932 commit 9a91e2e
Showing 699 changed files with 94,814 additions and 33,351 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -15,6 +15,6 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16
go-version: 1.18
- name: Build
run: make commit
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16
go-version: 1.18
- name: Build
run: make commit
- name: Automatic Releases
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -8,8 +8,7 @@ LDFLAGS := ${LDFLAGS} -X github.com/tomcz/openldap_exporter.tag=${GIT_TAG}
precommit: clean format lint build

.PHONY: commit
commit: clean
GO111MODULE=on GOFLAGS='-mod=vendor' $(MAKE) build
commit: clean build

.PHONY: clean
clean:
@@ -21,15 +20,15 @@ target:
.PHONY: format
format:
ifeq (, $(shell which goimports))
go get golang.org/x/tools/cmd/goimports
go install golang.org/x/tools/cmd/goimports@latest
endif
@echo "Running goimports ..."
@goimports -w -local github.com/tomcz/openldap_exporter $(shell find . -type f -name '*.go' | grep -v '/vendor/')

.PHONY: lint
lint:
ifeq (, $(shell which staticcheck))
go install honnef.co/go/tools/cmd/staticcheck@2021.1
go install honnef.co/go/tools/cmd/staticcheck@latest
endif
@echo "Running staticcheck ..."
@staticcheck $(shell go list ./... | grep -v /vendor/)
43 changes: 35 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,41 @@
module github.com/tomcz/openldap_exporter

go 1.16
go 1.18

require (
github.com/go-kit/kit v0.10.0
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/exporter-toolkit v0.5.1
github.com/sirupsen/logrus v1.6.0
github.com/urfave/cli/v2 v2.2.0
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
github.com/go-kit/log v0.2.0
github.com/prometheus/client_golang v1.12.1
github.com/prometheus/exporter-toolkit v0.7.1
github.com/sirupsen/logrus v1.8.1
github.com/urfave/cli/v2 v2.4.0
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
gopkg.in/ldap.v2 v2.5.1
)

require (
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
golang.org/x/crypto v0.0.0-20210915214749-c084706c2272 // indirect
golang.org/x/net v0.0.0-20210917221730-978cfadd31cf // indirect
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/appengine v1.6.6 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/asn1-ber.v1 v1.5.4 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)

replace gopkg.in/asn1-ber.v1 => github.com/go-asn1-ber/asn1-ber v1.5.4
549 changes: 313 additions & 236 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion server.go
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import (
"net/http"
"time"

kitlog "github.com/go-kit/kit/log"
kitlog "github.com/go-kit/log"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/prometheus/exporter-toolkit/web"
log "github.com/sirupsen/logrus"
8 changes: 0 additions & 8 deletions vendor/github.com/cespare/xxhash/v2/.travis.yml

This file was deleted.

6 changes: 4 additions & 2 deletions vendor/github.com/cespare/xxhash/v2/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions vendor/github.com/cespare/xxhash/v2/go.mod

This file was deleted.

Empty file.
1 change: 0 additions & 1 deletion vendor/github.com/cespare/xxhash/v2/xxhash.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 31 additions & 31 deletions vendor/github.com/cespare/xxhash/v2/xxhash_amd64.s

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 32 additions & 21 deletions vendor/github.com/cespare/xxhash/v2/xxhash_unsafe.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9a91e2e

Please sign in to comment.