From c079729bf373f0e8e879268f09e82569f62fc4b2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 2 Jun 2022 14:21:55 -0600 Subject: [PATCH] Fix RC CI Signed-off-by: Luke Shumaker --- build-aux/main.mk | 4 ++-- docs/publish_yaml_s3.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-aux/main.mk b/build-aux/main.mk index 7cdbd9a810..5401d52b52 100644 --- a/build-aux/main.mk +++ b/build-aux/main.mk @@ -192,9 +192,9 @@ clobber: clean clean: build-output.rm-r -python.clean: %.clean: python/ambassador.egg-info.rm-r +python.clean releng.clean: %.clean: python/ambassador.egg-info.rm-r find $* -name __pycache__ -exec rm -rf -- {} + -clean: python.clean +clean: python.clean releng.clean cmd.clean pkg.clean: %.clean: find $* -name '*.yaml.o' -delete diff --git a/docs/publish_yaml_s3.sh b/docs/publish_yaml_s3.sh index d99895bfc8..0eb6af55f6 100755 --- a/docs/publish_yaml_s3.sh +++ b/docs/publish_yaml_s3.sh @@ -17,7 +17,7 @@ errusage() { [[ -d "$1" ]] || errusage 'DIR is not a directory: %q' "$dir" [[ -n "$AWS_ACCESS_KEY_ID" ]] || errusage "AWS_ACCESS_KEY_ID is not set" [[ -n "$AWS_SECRET_ACCESS_KEY" ]] || errusage "AWS_SECRET_ACCESS_KEY is not set" -[[ "${VERSION:-}" != v2.* ]] || errusage "VERSION must be set to a 'v2.*' string" +[[ "${VERSION:-}" == v2.* ]] || errusage "VERSION must be set to a 'v2.*' string" dir=$1 while [[ "$dir" == */ ]]; do dir=${dir%/}