From 25979480d47782917303176c77d6f7262354114b Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Thu, 15 Mar 2018 18:57:57 -0700 Subject: [PATCH 1/3] hack: correctly check for empty PULL_BASE_SHA The existing comparison fails due to the 'nounset' option being on. That failure masks the nicely formatted error message the if message is trying to print. This correctly prints the intended error instead of bash's default unset behavior. --- hack/verify-chart-version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/verify-chart-version.sh b/hack/verify-chart-version.sh index bdb7a1485..40273e370 100755 --- a/hack/verify-chart-version.sh +++ b/hack/verify-chart-version.sh @@ -20,7 +20,7 @@ set -o pipefail semvercompareOldVer="" semvercompareNewVer="" -if [ "${PULL_BASE_SHA}" == "" ]; then +if [ -z "${PULL_BASE_SHA+a}" ]; then echo "PULL_BASE_SHA must be set" exit 1 fi @@ -31,7 +31,7 @@ fi git fetch jetstack "${PULL_BASE_SHA}:refs/remotes/jetstack/pull-base" -SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/.. +SCRIPT_ROOT="$(dirname "${BASH_SOURCE}")/.." CHANGED_FOLDERS=`git diff --find-renames --name-only $(git merge-base jetstack/pull-base HEAD) "${SCRIPT_ROOT}/contrib/charts/" | awk -F/ '{print $1"/"$2"/"$3}' | uniq` From 9f76e28d02f159156e9f1c16885ab70430ba6e4f Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Thu, 15 Mar 2018 18:59:54 -0700 Subject: [PATCH 2/3] make: default to building, not verifying --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7fa05aca6..e7ad6b47b 100644 --- a/Makefile +++ b/Makefile @@ -42,8 +42,8 @@ GOLDFLAGS := -ldflags "-X $(PACKAGE_NAME)/pkg/util.AppGitState=${GIT_STATE} -X $ # Alias targets ############### -verify: generate_verify deploy_verify hack_verify go_verify build: $(CMDS) docker_build +verify: generate_verify deploy_verify hack_verify go_verify docker_build: $(DOCKER_BUILD_TARGETS) docker_push: $(DOCKER_PUSH_TARGETS) push: build docker_push From 9233e30ef5764c181bd39466fdc1d9201b2c5e10 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Thu, 15 Mar 2018 19:08:03 -0700 Subject: [PATCH 3/3] make: split 'verify_pr' out This allows a developer to type 'make verify' and get working useful output. The new char_verify behavior can't currently be run on a developer's machine since it depends on a git pr sha being set. I also fixed up the list of phony targets --- .travis.yml | 2 +- Makefile | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4f130cf9..a381220a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,4 +23,4 @@ jobs: language: go go: 1.9 script: - - make verify test + - make verify verify_pr test diff --git a/Makefile b/Makefile index e7ad6b47b..ece787b62 100644 --- a/Makefile +++ b/Makefile @@ -37,13 +37,16 @@ GOOS := linux GOARCH := amd64 GOLDFLAGS := -ldflags "-X $(PACKAGE_NAME)/pkg/util.AppGitState=${GIT_STATE} -X $(PACKAGE_NAME)/pkg/util.AppGitCommit=${GIT_COMMIT} -X $(PACKAGE_NAME)/pkg/util.AppVersion=${APP_VERSION}" -.PHONY: verify build docker_build push generate generate_verify $(CMDS) go_test go_fmt $(DOCKER_BUILD_TARGETS) $(DOCKER_PUSH_TARGETS) +.PHONY: verify build docker_build push generate generate_verify deploy_verify \ + $(CMDS) go_test go_fmt e2e_test go_verify hack_verify hack_verify_pr \ + $(DOCKER_BUILD_TARGETS) $(DOCKER_PUSH_TARGETS) # Alias targets ############### build: $(CMDS) docker_build verify: generate_verify deploy_verify hack_verify go_verify +verify_pr: hack_verify_pr docker_build: $(DOCKER_BUILD_TARGETS) docker_push: $(DOCKER_PUSH_TARGETS) push: build docker_push @@ -64,6 +67,8 @@ hack_verify: $(HACK_DIR)/verify-links.sh @echo Running errexit checker $(HACK_DIR)/verify-errexit.sh + +hack_verify_pr: @echo Running helm chart version checker $(HACK_DIR)/verify-chart-version.sh