Put verify-apimachinery into ci makefile target

Otherwise travis doesn't display the failure as clearly, because it runs
`make ci` which fails, but then it still runs `verify-apimachinery`
which usually passes.
This commit is contained in:
Justin Santa Barbara 2018-06-04 06:29:19 -07:00
parent 5c630d3df0
commit 7948979f7a
2 changed files with 4 additions and 2 deletions

View File

@ -11,4 +11,3 @@ go_import_path: k8s.io/kops
script:
- make ci
- hack/verify-apimachinery.sh

View File

@ -519,7 +519,7 @@ verify-bazel:
# verify-package has to be after verify-gendoc, because with .gitignore for federation bindata
# it bombs in travis. verify-gendoc generates the bindata file.
.PHONY: ci
ci: govet verify-gofmt verify-boilerplate verify-bazel nodeup examples test | verify-gendocs verify-packages
ci: govet verify-gofmt verify-boilerplate verify-bazel nodeup examples test | verify-gendocs verify-packages verify-apimachinery
echo "Done!"
# --------------------------------------------------
@ -580,6 +580,9 @@ apimachinery-codegen:
${GOPATH}/bin/client-gen ${API_OPTIONS} --clientset-name="clientset" --input-base k8s.io/kops/pkg/apis/ --input="kops/,kops/v1alpha1,kops/v1alpha2" --clientset-path k8s.io/kops/pkg/client/clientset_generated/ \
--go-header-file "hack/boilerplate/boilerplate.go.txt"
.PHONY: verify-apimachinery
verify-apimachinery:
hack/verify-apimachinery.sh
# -----------------------------------------------------
# kops-server