From 77bc30ab1df76a85f40ffd895e76ae9aeb0821e5 Mon Sep 17 00:00:00 2001 From: Yihau Chen Date: Wed, 13 Mar 2024 12:17:08 +0800 Subject: [PATCH 1/2] [anza migration]: fix download link for net scripts (#219) (cherry picked from commit e682fec28e6c40741c7e6c5a566553d0c3f916f4) # Conflicts: # net/net.sh # scripts/agave-install-deploy.sh --- net/net.sh | 4 ++++ scripts/agave-install-deploy.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/net/net.sh b/net/net.sh index 72ad1900bfeb63..7252cb226680b9 100755 --- a/net/net.sh +++ b/net/net.sh @@ -563,7 +563,11 @@ prepareDeploy() { if [[ -n $releaseChannel ]]; then echo "Downloading release from channel: $releaseChannel" rm -f "$SOLANA_ROOT"/solana-release.tar.bz2 +<<<<<<< HEAD declare updateDownloadUrl=https://release.solana.com/"$releaseChannel"/solana-release-x86_64-unknown-linux-gnu.tar.bz2 +======= + declare updateDownloadUrl=https://release.anza.xyz/"$releaseChannel"/solana-release-x86_64-unknown-linux-gnu.tar.bz2 +>>>>>>> e682fec28e ([anza migration]: fix download link for net scripts (#219)) ( set -x curl -L -I "$updateDownloadUrl" diff --git a/scripts/agave-install-deploy.sh b/scripts/agave-install-deploy.sh index a8f8eeb65b3857..db447f5d1d7fb3 100755 --- a/scripts/agave-install-deploy.sh +++ b/scripts/agave-install-deploy.sh @@ -57,7 +57,11 @@ esac case $TAG in edge|beta) +<<<<<<< HEAD DOWNLOAD_URL=https://release.solana.com/"$TAG"/solana-release-$TARGET.tar.bz2 +======= + DOWNLOAD_URL=https://release.anza.xyz/"$TAG"/solana-release-$TARGET.tar.bz2 +>>>>>>> e682fec28e ([anza migration]: fix download link for net scripts (#219)) ;; *) DOWNLOAD_URL=https://github.com/solana-labs/solana/releases/download/"$TAG"/solana-release-$TARGET.tar.bz2 From 8c3f9b9bd4186d924473068b708b86bbb8eaa6e1 Mon Sep 17 00:00:00 2001 From: yihau Date: Thu, 21 Mar 2024 10:45:58 +0800 Subject: [PATCH 2/2] fix conflict --- net/net.sh | 4 ---- scripts/agave-install-deploy.sh | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/net/net.sh b/net/net.sh index 7252cb226680b9..52ca8cdc0d0cc3 100755 --- a/net/net.sh +++ b/net/net.sh @@ -563,11 +563,7 @@ prepareDeploy() { if [[ -n $releaseChannel ]]; then echo "Downloading release from channel: $releaseChannel" rm -f "$SOLANA_ROOT"/solana-release.tar.bz2 -<<<<<<< HEAD - declare updateDownloadUrl=https://release.solana.com/"$releaseChannel"/solana-release-x86_64-unknown-linux-gnu.tar.bz2 -======= declare updateDownloadUrl=https://release.anza.xyz/"$releaseChannel"/solana-release-x86_64-unknown-linux-gnu.tar.bz2 ->>>>>>> e682fec28e ([anza migration]: fix download link for net scripts (#219)) ( set -x curl -L -I "$updateDownloadUrl" diff --git a/scripts/agave-install-deploy.sh b/scripts/agave-install-deploy.sh index db447f5d1d7fb3..dcdec14ffb635d 100755 --- a/scripts/agave-install-deploy.sh +++ b/scripts/agave-install-deploy.sh @@ -57,14 +57,10 @@ esac case $TAG in edge|beta) -<<<<<<< HEAD - DOWNLOAD_URL=https://release.solana.com/"$TAG"/solana-release-$TARGET.tar.bz2 -======= DOWNLOAD_URL=https://release.anza.xyz/"$TAG"/solana-release-$TARGET.tar.bz2 ->>>>>>> e682fec28e ([anza migration]: fix download link for net scripts (#219)) ;; *) - DOWNLOAD_URL=https://github.com/solana-labs/solana/releases/download/"$TAG"/solana-release-$TARGET.tar.bz2 + DOWNLOAD_URL=https://github.com/anza-xyz/agave/releases/download/"$TAG"/solana-release-$TARGET.tar.bz2 ;; esac