From 779bf5bb2f50b7a983744c73d2ea5627977d42de Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Thu, 14 Dec 2023 23:41:27 +0000 Subject: [PATCH] fix a logic error that forced all k8s packages to be rebuilt (#4992) --- bin/upload-dist-staging.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/upload-dist-staging.sh b/bin/upload-dist-staging.sh index 9f40c1a903..d5cecd4985 100755 --- a/bin/upload-dist-staging.sh +++ b/bin/upload-dist-staging.sh @@ -30,9 +30,9 @@ function package_has_changes() { fi if is_old_kubernetes "${key}" ; then - # if old kubernetes package then we can't calculate changes + # we cannot rebuild old kubernetes packages, so we should always say there were no changes echo "Old kubernetes package ${package}" - return 0 + return 1 fi local upstream_gitsha= @@ -51,7 +51,7 @@ function package_has_changes() { fi } -# kubernetes packages before 1.24 are not available in the new repo, and so should be copied +# kubernetes packages before 1.24 are not available in the new yum/apt repo, and so should be copied function is_old_kubernetes() { local package="$1" if echo "${package}" | grep -q "kubernetes-1.15" ; then