From a669ad3ad076c526a1c7d614db31551939414520 Mon Sep 17 00:00:00 2001 From: Daneyon Hansen Date: Thu, 12 Dec 2024 14:48:07 -0800 Subject: [PATCH] Fixes .phony and whitespace Signed-off-by: Daneyon Hansen --- Makefile | 2 +- changelog/{v1.19.0-beta2 => v1.19.0-beta3}/issue_10445.yaml | 0 ci/sync-gateway-api.sh | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) rename changelog/{v1.19.0-beta2 => v1.19.0-beta3}/issue_10445.yaml (100%) diff --git a/Makefile b/Makefile index 1baeab94e39..21e5f234a14 100644 --- a/Makefile +++ b/Makefile @@ -1258,7 +1258,7 @@ conformance-%: $(TEST_ASSET_DIR)/conformance/conformance_test.go go test -mod=mod -ldflags=$(LDFLAGS) -tags conformance -test.v $(TEST_ASSET_DIR)/conformance/... -args $(CONFORMANCE_ARGS) \ -run-test=$* -.PHONY: sync-gateway-crds +.PHONY: sync-gateway-api sync-gateway-api: ## Syncronize the Gateway API version used by the repo with the provided $CONFORMANCE_VERSION. @./ci/sync-gateway-api.sh diff --git a/changelog/v1.19.0-beta2/issue_10445.yaml b/changelog/v1.19.0-beta3/issue_10445.yaml similarity index 100% rename from changelog/v1.19.0-beta2/issue_10445.yaml rename to changelog/v1.19.0-beta3/issue_10445.yaml diff --git a/ci/sync-gateway-api.sh b/ci/sync-gateway-api.sh index 7fb7477fe97..008e3706e12 100755 --- a/ci/sync-gateway-api.sh +++ b/ci/sync-gateway-api.sh @@ -8,7 +8,7 @@ SETUP_KIND_FILE="./ci/kind/setup-kind.sh" # Function to source specific variables from the setup-kind.sh script source_specific_vars() { local vars_to_source=("CONFORMANCE_VERSION" "CONFORMANCE_CHANNEL") - + for var in "${vars_to_source[@]}"; do eval $(grep "^$var=" "$SETUP_KIND_FILE") done @@ -100,7 +100,7 @@ download_gateway_crd() { echo "Downloading Gateway CRD from $url to $dest..." curl -sLo "$dest.tmp" "$url" - + if [ -f "$dest" ] && cmp -s "$dest" "$dest.tmp"; then echo "No changes detected in $dest." rm "$dest.tmp" @@ -116,7 +116,7 @@ download_tcproute_crd() { echo "Downloading TCPRoute CRD from $url to $dest..." curl -sLo "$dest.tmp" "$url" - + # Always create the temporary file with the header echo "$HEADER" > "$dest.tmp.full" cat "$dest.tmp" >> "$dest.tmp.full"