diff --git a/.travis.yml b/.travis.yml index 8b0331120e..cb4d178c98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,16 +13,7 @@ install: - export PATH=$GOPATH/bin:./third_party/etcd:$PATH script: - - ./hack/verify-gofmt.sh - - ./hack/verify-boilerplate.sh - - ./hack/verify-description.sh - - ./hack/verify-generated-conversions.sh - - ./hack/verify-generated-deep-copies.sh - - ./hack/verify-generated-docs.sh - - ./hack/verify-swagger-spec.sh - - ./hack/verify-linkcheck.sh - - ./hack/verify-flags-underscore.py - - ./hack/verify-godeps.sh $TRAVIS_BRANCH + - make verify BRANCH=$TRAVIS_BRANCH notifications: irc: "chat.freenode.net#kubernetes-dev" diff --git a/Makefile b/Makefile index bfc43cb6c8..88d6bfe4f0 100644 --- a/Makefile +++ b/Makefile @@ -34,8 +34,12 @@ all: # Runs all the presubmission verifications. # +# Args: +# BRANCH: Branch to be passed to hack/verify-godeps.sh script. +# # Example: # make verify +# make verify BRANCH=branch_x verify: hack/verify-gofmt.sh hack/verify-boilerplate.sh @@ -46,7 +50,7 @@ verify: hack/verify-swagger-spec.sh hack/verify-linkcheck.sh hack/verify-flags-underscore.py - hack/verify-godeps.sh + hack/verify-godeps.sh $(BRANCH) .PHONY: verify # Build and run tests. diff --git a/shippable.yml b/shippable.yml index cba26ee3d0..5614cb8cb9 100644 --- a/shippable.yml +++ b/shippable.yml @@ -43,17 +43,8 @@ install: - ./hack/build-go.sh - godep go install ./... - ./hack/travis/install-etcd.sh - - ./hack/verify-gofmt.sh - - ./hack/verify-boilerplate.sh - - ./hack/verify-description.sh - - ./hack/verify-flags-underscore.py - - ./hack/verify-godeps.sh ${BASE_BRANCH} - ./hack/travis/install-std-race.sh - - ./hack/verify-generated-conversions.sh - - ./hack/verify-generated-deep-copies.sh - - ./hack/verify-generated-docs.sh - - ./hack/verify-swagger-spec.sh - - ./hack/verify-linkcheck.sh + - make verify BRANCH=${BASE_BRANCH} script: # Disable coverage collection on pull requests