From d5a78fbeaede3838588cefbcff83c7a68795a487 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Mon, 6 Jan 2025 20:13:30 +0100 Subject: Revert "add new CI step: "setup upstream remote"" This reverts commit 4454fa998c9da1f1eee1602c8e8cd2732505c104. (cherry picked from commit 395fb701e74f58e6c77e2cbdc1967478924e819f) --- src/ci/scripts/setup-upstream-remote.sh | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100755 src/ci/scripts/setup-upstream-remote.sh (limited to 'src/ci/scripts') diff --git a/src/ci/scripts/setup-upstream-remote.sh b/src/ci/scripts/setup-upstream-remote.sh deleted file mode 100755 index 52b4c98a890..00000000000 --- a/src/ci/scripts/setup-upstream-remote.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# In CI environments, bootstrap is forced to use the remote upstream based -# on "git_repository" and "nightly_branch" values from src/stage0 file. -# This script configures the remote as it may not exist by default. - -set -euo pipefail -IFS=$'\n\t' - -ci_dir=$(cd $(dirname $0) && pwd)/.. -source "$ci_dir/shared.sh" - -git_repository=$(parse_stage0_file_by_key "git_repository") -nightly_branch=$(parse_stage0_file_by_key "nightly_branch") - -# Configure "rust-lang/rust" upstream remote only when it's not origin. -if [ -z "$(git config remote.origin.url | grep $git_repository)" ]; then - echo "Configuring https://github.com/$git_repository remote as upstream." - git remote add upstream "https://github.com/$git_repository" - REMOTE_NAME="upstream" -else - REMOTE_NAME="origin" -fi - -git fetch $REMOTE_NAME $nightly_branch -- cgit 1.4.1-3-g733a5