From 8738d879f406329a56c7128f631a4829247aaf9d Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Thu, 2 Apr 2026 18:51:00 +0800 Subject: [PATCH 1/2] ci: replace deprecated PingCAP domains --- scripts/build_tiup_grafana.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/build_tiup_grafana.sh b/scripts/build_tiup_grafana.sh index b2d96900..6b7be6d2 100644 --- a/scripts/build_tiup_grafana.sh +++ b/scripts/build_tiup_grafana.sh @@ -8,7 +8,11 @@ GrafanaPath=grafana-$TARGET_OS-$TARGET_ARCH grafanaFile="grafana-${grafanaVer}.${TARGET_OS}-${TARGET_ARCH}.tar.gz" downloadUrl="https://dl.grafana.com/oss/release/$grafanaFile" if [ "$TARGET_OS/$TARGET_ARCH" = "darwin/arm64" ]; then - downloadUrl="https://download.pingcap.org/$grafanaFile" +<<<<<<< HEAD + downloadUrl="https://download.pingcap.com/$grafanaFile" +======= + downloadUrl="https://download.pingcap.com/$grafanaFile" +>>>>>>> cc16aed (ci: replace deprecated PingCAP domains) fi mkdir -p $GrafanaPath && cd "$GrafanaPath" mkdir -p grafana From 3fd791c73cebbec349725277b9b34a5460b54598 Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Thu, 2 Apr 2026 19:08:37 +0800 Subject: [PATCH 2/2] fix(ci): resolve release-7.1 grafana script conflict --- scripts/build_tiup_grafana.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/build_tiup_grafana.sh b/scripts/build_tiup_grafana.sh index 6b7be6d2..0dafc17d 100644 --- a/scripts/build_tiup_grafana.sh +++ b/scripts/build_tiup_grafana.sh @@ -8,11 +8,7 @@ GrafanaPath=grafana-$TARGET_OS-$TARGET_ARCH grafanaFile="grafana-${grafanaVer}.${TARGET_OS}-${TARGET_ARCH}.tar.gz" downloadUrl="https://dl.grafana.com/oss/release/$grafanaFile" if [ "$TARGET_OS/$TARGET_ARCH" = "darwin/arm64" ]; then -<<<<<<< HEAD downloadUrl="https://download.pingcap.com/$grafanaFile" -======= - downloadUrl="https://download.pingcap.com/$grafanaFile" ->>>>>>> cc16aed (ci: replace deprecated PingCAP domains) fi mkdir -p $GrafanaPath && cd "$GrafanaPath" mkdir -p grafana