Merge pull request #1747 from prometheus/beorn7/build
Fix build problems
This commit is contained in:
commit
59fd5df91b
2
Makefile
2
Makefile
|
@ -28,7 +28,7 @@ PRECHECK_OPTIONS_bzr = version
|
|||
build-all: assets apiv2 build
|
||||
|
||||
assets: ui/app/script.js ui/app/index.html ui/app/lib template/default.tmpl
|
||||
cd $(PREFIX)/asset && $(GO) generate
|
||||
GO111MODULE=$(GO111MODULE) $(GO) generate ./asset
|
||||
@$(GOFMT) -w ./asset
|
||||
|
||||
ui/app/script.js: $(shell find ui/app/src -iname *.elm) api/v2/openapi.yaml
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
fmt.Fprintf
|
||||
fmt.Fprintln
|
||||
|
||||
// Exclude both vendored and un-vendored to cover both vendor mode and module mode.
|
||||
(github.com/prometheus/alertmanager/vendor/github.com/go-kit/kit/log.Logger).Log
|
||||
// Allowed log levels are enforced via kingpin
|
||||
(*github.com/prometheus/alertmanager/vendor/github.com/prometheus/common/promlog.AllowedLevel).Set
|
||||
(github.com/go-kit/kit/log.Logger).Log
|
||||
// Generated via go-swagger
|
||||
(*github.com/prometheus/alertmanager/api/v2/restapi.Server).Shutdown
|
||||
|
|
Loading…
Reference in New Issue