diff options
| author | bors <bors@rust-lang.org> | 2025-01-07 01:26:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-07 01:26:09 +0000 |
| commit | 9fc6b43126469e3858e2fe86cafb4f0fd5068869 (patch) | |
| tree | f51c9d8c08e9551bb12201a96fbd335c6c32be4e /src/ci | |
| parent | 953a5caef005993f93d8fe9baa344cc2591496c2 (diff) | |
| parent | 6287749471076a3065a5793cb0a1678324e768bb (diff) | |
| download | rust-1.84.0.tar.gz rust-1.84.0.zip | |
Auto merge of #135162 - pietroalbini:pa-stable, r=pietroalbini 1.84.0
Prepare Rust 1.84.0 stable release Included a backport of https://github.com/rust-lang/rust/issues/135034, and squashed the release notes. r? `@ghost`
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/channel | 2 | ||||
| -rwxr-xr-x | src/ci/scripts/setup-upstream-remote.sh | 24 | ||||
| -rw-r--r-- | src/ci/shared.sh | 12 |
3 files changed, 1 insertions, 37 deletions
diff --git a/src/ci/channel b/src/ci/channel index 65b2df87f7d..2bf5ad0447d 100644 --- a/src/ci/channel +++ b/src/ci/channel @@ -1 +1 @@ -beta +stable 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 diff --git a/src/ci/shared.sh b/src/ci/shared.sh index 1e6a008a5de..2b0a10e4d08 100644 --- a/src/ci/shared.sh +++ b/src/ci/shared.sh @@ -136,15 +136,3 @@ function releaseChannel { echo $RUST_CI_OVERRIDE_RELEASE_CHANNEL fi } - -# Parse values from src/stage0 file by key -function parse_stage0_file_by_key { - local key="$1" - local file="$ci_dir/../stage0" - local value=$(awk -F= '{a[$1]=$2} END {print(a["'$key'"])}' $file) - if [ -z "$value" ]; then - echo "ERROR: Key '$key' not found in '$file'." - exit 1 - fi - echo "$value" -} |
