From 137ab2bdb7b655f8bcea6251d64a32aac2fb57ce Mon Sep 17 00:00:00 2001 From: Xudong Liu Date: Tue, 5 Mar 2024 17:08:24 +0800 Subject: [PATCH] Update bump-k8s-dep.sh fix bump-k8s-dep.sh bug --- hack/bump-k8s-dep.sh | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/hack/bump-k8s-dep.sh b/hack/bump-k8s-dep.sh index bf27a8e75..b9bdedf7d 100755 --- a/hack/bump-k8s-dep.sh +++ b/hack/bump-k8s-dep.sh @@ -25,17 +25,6 @@ set -o pipefail dependencies=("k8s.io/api" "k8s.io/client-go" "k8s.io/cloud-provider" "k8s.io/apimachinery" "k8s.io/code-generator" "k8s.io/component-base" "k8s.io/klog/v2") -compare_versions() { - version1=$1 - version2=$2 - - if [[ $(echo -e "$version1\n$version2" | sort -V | tail -n 1) == "$version1" ]]; then - return 0 - else - return 1 - fi -} - check_and_bump_dependency() { dep=$1 current_version=$(go list -m -f '{{.Version}}' "${dep}") @@ -45,15 +34,12 @@ check_and_bump_dependency() { echo "Current $dep version: $current_version" echo "Latest $dep version: $latest_version" - compare_versions "$current_version" "$latest_version" - result=$? - # Bump the version if needed - if [ $result -eq 1 ]; then - echo "Updating $dep to the $latest_version..." - go get -u k8s.io/api@"${latest_version}" + if [ "$current_version" == "$latest_version" ]; then + echo "$dep@$current_version is already up to date." else - echo "$dep is already up to date." + echo "Updating $dep to the $latest_version..." + go get -u "${dep}"@"${latest_version}" fi } @@ -62,4 +48,4 @@ for dep in "${dependencies[@]}"; do check_and_bump_dependency "$dep" done -go mod tidy \ No newline at end of file +go mod tidy