mirror of
https://github.com/kubernetes-sigs/prometheus-adapter.git
synced 2026-04-05 17:27:51 +00:00
[build] Add gofmt-related Makefile targets
This adds `verify-gofmt` and `gofmt` make targets for quick go-fmting. It also adds a `verify` target which verifies `gofmt` and the runs the unit tests. Travis now runs `make verify` instead of just `make test` as the tests.
This commit is contained in:
parent
bbf23f18d0
commit
417f5a9f99
3 changed files with 51 additions and 2 deletions
|
|
@ -16,7 +16,7 @@ addons:
|
||||||
install:
|
install:
|
||||||
- make -B vendor
|
- make -B vendor
|
||||||
|
|
||||||
script: make test
|
script: make verify
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
directories:
|
directories:
|
||||||
|
|
|
||||||
10
Makefile
10
Makefile
|
|
@ -24,7 +24,7 @@ ifeq ($(ARCH),s390x)
|
||||||
BASEIMAGE?=s390x/busybox
|
BASEIMAGE?=s390x/busybox
|
||||||
endif
|
endif
|
||||||
|
|
||||||
.PHONY: all build docker-build push-% push test
|
.PHONY: all build docker-build push-% push test verify-gofmt gofmt verify
|
||||||
|
|
||||||
all: build
|
all: build
|
||||||
build: vendor
|
build: vendor
|
||||||
|
|
@ -56,3 +56,11 @@ vendor: glide.lock
|
||||||
|
|
||||||
test: vendor
|
test: vendor
|
||||||
CGO_ENABLED=0 go test ./pkg/...
|
CGO_ENABLED=0 go test ./pkg/...
|
||||||
|
|
||||||
|
verify-gofmt:
|
||||||
|
./hack/gofmt-all.sh -v
|
||||||
|
|
||||||
|
gofmt:
|
||||||
|
./hack/gofmt-all.sh
|
||||||
|
|
||||||
|
verify: verify-gofmt test
|
||||||
|
|
|
||||||
41
hack/gofmt-all.sh
Executable file
41
hack/gofmt-all.sh
Executable file
|
|
@ -0,0 +1,41 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Copyright 2017 The Kubernetes Authors.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
|
||||||
|
set -o errexit
|
||||||
|
set -o nounset
|
||||||
|
set -o pipefail
|
||||||
|
|
||||||
|
verify=0
|
||||||
|
if [[ ${1:-} = "--verify" || ${1:-} = "-v" ]]; then
|
||||||
|
verify=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
find_files() {
|
||||||
|
find . -not \( \( \
|
||||||
|
-wholename './_output' \
|
||||||
|
-o -wholename './vendor' \
|
||||||
|
\) -prune \) -name '*.go'
|
||||||
|
}
|
||||||
|
|
||||||
|
if [[ $verify -eq 1 ]]; then
|
||||||
|
diff=$(find_files | xargs gofmt -s -d 2>&1)
|
||||||
|
if [[ -n "${diff}" ]]; then
|
||||||
|
echo "gofmt -s -w $(echo "${diff}" | awk '/^diff / { print $2 }' | tr '\n' ' ')"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
find_files | xargs gofmt -s -w
|
||||||
|
fi
|
||||||
Loading…
Add table
Add a link
Reference in a new issue