From 0759a95366f47423fe1f9ab60c75ad2bdab28e88 Mon Sep 17 00:00:00 2001 From: Anton Kanugalawattage Date: Wed, 29 Apr 2026 17:37:57 -0400 Subject: [PATCH] tools: Fix update-sha.sh for Envoy 1.38.0 --- tools/update-sha.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/update-sha.sh b/tools/update-sha.sh index 290ad8719..8e465adbb 100755 --- a/tools/update-sha.sh +++ b/tools/update-sha.sh @@ -8,13 +8,15 @@ set -o xtrace function find_sha() { local CONTENT=$1 local DEPENDENCY=$2 - echo "$CONTENT" | grep "$DEPENDENCY" -A 11 | grep -m 1 "version =" | awk '{ print $3 }' | tr -d '"' | tr -d "," + echo "$CONTENT" | grep -E "^[[:space:]]*${DEPENDENCY} = dict\(" -A 11 | grep -m 1 "version =" | awk '{ print $3 }' | tr -d '"' | tr -d "," } function find_date() { local CONTENT=$1 local DEPENDENCY=$2 - echo "$CONTENT" | grep "$DEPENDENCY" -A 11 | grep -m 1 "release_date =" | awk '{ print $3 }' | tr -d '"' | tr -d "," + local DATE + DATE=$(echo "$CONTENT" | grep -E "^[[:space:]]*${DEPENDENCY} = dict\(" -A 11 | grep -m 1 "release_date =" | awk '{ print $3 }' | tr -d '"' | tr -d ",") + echo "${DATE:-unknown}" } function find_envoy_sha_from_tag() { @@ -36,8 +38,8 @@ PGV_GIT_DATE=$(find_date "$CURL_OUTPUT" com_envoyproxy_protoc_gen_validate) PROMETHEUS_SHA=$(find_sha "$CURL_OUTPUT" prometheus_metrics_model) PROMETHEUS_DATE=$(find_date "$CURL_OUTPUT" prometheus_metrics_model) -XDS_SHA=$(find_sha "$CURL_OUTPUT" com_github_cncf_xds) -XDS_DATE=$(find_date "$CURL_OUTPUT" com_github_cncf_xds) +XDS_SHA=$(find_sha "$CURL_OUTPUT" xds) +XDS_DATE=$(find_date "$CURL_OUTPUT" xds) OPENTELEMETRY_SHA=$(find_sha "$CURL_OUTPUT" opentelemetry_proto) OPENTELEMETRY_DATE=$(find_date "$CURL_OUTPUT" opentelemetry_proto)