diff options
| author | bors <bors@rust-lang.org> | 2024-10-13 03:59:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-13 03:59:00 +0000 |
| commit | ecf2d1fa4bd8166c696883b10f483122b1fe98a3 (patch) | |
| tree | 18c963c7b385d49172e31bf764ced45026b90feb /src/ci/scripts | |
| parent | ef4e8259b5016d85e261587b605028b2ff06c13d (diff) | |
| parent | 39071fdc586adccf18c01e5e3a1faa39bbc00c3a (diff) | |
| download | rust-ecf2d1fa4bd8166c696883b10f483122b1fe98a3.tar.gz rust-ecf2d1fa4bd8166c696883b10f483122b1fe98a3.zip | |
Auto merge of #131635 - tgross35:rollup-df8il2t, r=tgross35
Rollup of 7 pull requests Successful merges: - #131120 (Stabilize `const_option`) - #131334 (Enable sanitizers for loongarch64-unknown-*) - #131358 (force "HEAD" for non-CI and `git_upstream_merge_base` for CI environment) - #131418 (Use throw intrinsic from stdarch in wasm libunwind) - #131579 (Remap path prefix in the panic message of `tests/ui/meta/revision-bad.rs`) - #131591 (add latest crash tests) - #131626 (remove a couple of redundant String to String conversion) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/setup-upstream-remote.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/ci/scripts/setup-upstream-remote.sh b/src/ci/scripts/setup-upstream-remote.sh new file mode 100755 index 00000000000..52b4c98a890 --- /dev/null +++ b/src/ci/scripts/setup-upstream-remote.sh @@ -0,0 +1,24 @@ +#!/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 |