From 6b8353081aa97f747cc3fffcfb4c5da66abb15c7 Mon Sep 17 00:00:00 2001 From: Scott Seago Date: Thu, 25 Aug 2022 14:02:50 -0400 Subject: [PATCH] renamed update files so that protoc is run before CRD update. If generating protoc go files from scratch, `make update` fails if CRD generation happens first, since the protoc-generated files are imported by the api go files. protoc generation needs to happen earlier. Signed-off-by: Scott Seago --- hack/{update-fmt.sh => update-1fmt.sh} | 0 hack/{update-proto.sh => update-2proto.sh} | 0 ...date-generated-crd-code.sh => update-3generated-crd-code.sh} | 0 ...ed-issue-template.sh => update-4generated-issue-template.sh} | 0 hack/verify-fmt.sh | 2 +- hack/verify-generated-crd-code.sh | 2 +- hack/verify-generated-issue-template.sh | 2 +- 7 files changed, 3 insertions(+), 3 deletions(-) rename hack/{update-fmt.sh => update-1fmt.sh} (100%) rename hack/{update-proto.sh => update-2proto.sh} (100%) rename hack/{update-generated-crd-code.sh => update-3generated-crd-code.sh} (100%) rename hack/{update-generated-issue-template.sh => update-4generated-issue-template.sh} (100%) diff --git a/hack/update-fmt.sh b/hack/update-1fmt.sh similarity index 100% rename from hack/update-fmt.sh rename to hack/update-1fmt.sh diff --git a/hack/update-proto.sh b/hack/update-2proto.sh similarity index 100% rename from hack/update-proto.sh rename to hack/update-2proto.sh diff --git a/hack/update-generated-crd-code.sh b/hack/update-3generated-crd-code.sh similarity index 100% rename from hack/update-generated-crd-code.sh rename to hack/update-3generated-crd-code.sh diff --git a/hack/update-generated-issue-template.sh b/hack/update-4generated-issue-template.sh similarity index 100% rename from hack/update-generated-issue-template.sh rename to hack/update-4generated-issue-template.sh diff --git a/hack/verify-fmt.sh b/hack/verify-fmt.sh index e592ed0cf..f3858cf24 100755 --- a/hack/verify-fmt.sh +++ b/hack/verify-fmt.sh @@ -15,4 +15,4 @@ # limitations under the License. HACK_DIR=$(dirname "${BASH_SOURCE[0]}") -"${HACK_DIR}"/update-fmt.sh --verify +"${HACK_DIR}"/update-1fmt.sh --verify diff --git a/hack/verify-generated-crd-code.sh b/hack/verify-generated-crd-code.sh index d4c097c79..387acd74e 100755 --- a/hack/verify-generated-crd-code.sh +++ b/hack/verify-generated-crd-code.sh @@ -16,7 +16,7 @@ HACK_DIR=$(dirname "${BASH_SOURCE}") -${HACK_DIR}/update-generated-crd-code.sh +${HACK_DIR}/update-3generated-crd-code.sh # ensure no changes to generated CRDs if ! git diff --exit-code config/crd/v1/crds/crds.go >/dev/null; then diff --git a/hack/verify-generated-issue-template.sh b/hack/verify-generated-issue-template.sh index 44e68e05a..7d5cbf4ef 100755 --- a/hack/verify-generated-issue-template.sh +++ b/hack/verify-generated-issue-template.sh @@ -27,7 +27,7 @@ cleanup() { } echo "Verifying generated Github issue template" -${HACK_DIR}/update-generated-issue-template.sh ${OUT_TMP_FILE} > /dev/null +${HACK_DIR}/update-4generated-issue-template.sh ${OUT_TMP_FILE} > /dev/null output=$(echo "`diff ${ISSUE_TEMPLATE_FILE} ${OUT_TMP_FILE}`") if [[ -n "${output}" ]] ; then