2021-03-05 12:12:59 -06:00
|
|
|
#!/usr/bin/env bash
|
2020-01-15 12:42:10 -06:00
|
|
|
|
|
|
|
set -e
|
|
|
|
|
2023-02-17 11:55:51 -06:00
|
|
|
TOOLCHAIN=${TOOLCHAIN:-$(date +%Y-%m-%d)}
|
|
|
|
|
2023-03-15 09:19:15 -05:00
|
|
|
function check_git_fixed_subtree() {
|
|
|
|
if [[ ! -e ./git-fixed-subtree.sh ]]; then
|
|
|
|
echo "Missing git-fixed-subtree.sh. Please run the following commands to download it:"
|
|
|
|
echo "curl --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/bjorn3/git/tqc-subtree-portable/contrib/subtree/git-subtree.sh -o git-fixed-subtree.sh"
|
|
|
|
echo "chmod u+x git-fixed-subtree.sh"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
if [[ ! -x ./git-fixed-subtree.sh ]]; then
|
|
|
|
echo "git-fixed-subtree.sh is not executable. Please run the following command to make it executable:"
|
|
|
|
echo "chmod u+x git-fixed-subtree.sh"
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2020-01-15 12:42:10 -06:00
|
|
|
case $1 in
|
|
|
|
"prepare")
|
|
|
|
echo "=> Installing new nightly"
|
2020-11-27 13:48:53 -06:00
|
|
|
rustup toolchain install --profile minimal "nightly-${TOOLCHAIN}" # Sanity check to see if the nightly exists
|
2021-03-29 03:45:09 -05:00
|
|
|
sed -i "s/\"nightly-.*\"/\"nightly-${TOOLCHAIN}\"/" rust-toolchain
|
2020-10-05 04:13:11 -05:00
|
|
|
rustup component add rustfmt || true
|
2020-01-15 12:42:10 -06:00
|
|
|
|
2022-03-30 00:42:10 -05:00
|
|
|
echo "=> Uninstalling all old nightlies"
|
2020-11-27 13:48:53 -06:00
|
|
|
for nightly in $(rustup toolchain list | grep nightly | grep -v "$TOOLCHAIN" | grep -v nightly-x86_64); do
|
|
|
|
rustup toolchain uninstall "$nightly"
|
2020-01-15 12:42:10 -06:00
|
|
|
done
|
|
|
|
|
|
|
|
./clean_all.sh
|
2020-05-18 04:35:23 -05:00
|
|
|
|
2023-02-15 12:23:11 -06:00
|
|
|
./y.sh prepare
|
2020-01-15 12:42:10 -06:00
|
|
|
;;
|
|
|
|
"commit")
|
2023-05-29 07:09:40 -05:00
|
|
|
git add rust-toolchain
|
2020-01-15 13:20:30 -06:00
|
|
|
git commit -m "Rustup to $(rustc -V)"
|
2020-01-15 12:42:10 -06:00
|
|
|
;;
|
2020-11-03 04:00:04 -06:00
|
|
|
"push")
|
2023-03-15 09:19:15 -05:00
|
|
|
check_git_fixed_subtree
|
|
|
|
|
2020-11-27 13:48:53 -06:00
|
|
|
cg_clif=$(pwd)
|
|
|
|
pushd ../rust
|
|
|
|
git pull origin master
|
|
|
|
branch=sync_cg_clif-$(date +%Y-%m-%d)
|
|
|
|
git checkout -b "$branch"
|
2023-03-15 09:19:15 -05:00
|
|
|
"$cg_clif/git-fixed-subtree.sh" pull --prefix=compiler/rustc_codegen_cranelift/ https://github.com/bjorn3/rustc_codegen_cranelift.git master
|
2020-11-27 13:48:53 -06:00
|
|
|
git push -u my "$branch"
|
|
|
|
|
|
|
|
# immediately merge the merge commit into cg_clif to prevent merge conflicts when syncing
|
|
|
|
# from rust-lang/rust later
|
2023-03-15 09:19:15 -05:00
|
|
|
"$cg_clif/git-fixed-subtree.sh" push --prefix=compiler/rustc_codegen_cranelift/ "$cg_clif" sync_from_rust
|
2020-11-27 13:48:53 -06:00
|
|
|
popd
|
|
|
|
git merge sync_from_rust
|
2020-11-03 04:00:04 -06:00
|
|
|
;;
|
2020-11-27 13:48:53 -06:00
|
|
|
"pull")
|
2023-03-15 09:19:15 -05:00
|
|
|
check_git_fixed_subtree
|
|
|
|
|
2023-02-17 11:55:51 -06:00
|
|
|
RUST_VERS=$(curl "https://static.rust-lang.org/dist/$TOOLCHAIN/channel-rust-nightly-git-commit-hash.txt")
|
|
|
|
echo "Pulling $RUST_VERS ($TOOLCHAIN)"
|
|
|
|
|
2020-11-27 13:48:53 -06:00
|
|
|
cg_clif=$(pwd)
|
|
|
|
pushd ../rust
|
2023-02-17 11:55:51 -06:00
|
|
|
git fetch origin master
|
|
|
|
git checkout "$RUST_VERS"
|
2023-03-15 09:19:15 -05:00
|
|
|
"$cg_clif/git-fixed-subtree.sh" push --prefix=compiler/rustc_codegen_cranelift/ "$cg_clif" sync_from_rust
|
2020-11-27 13:48:53 -06:00
|
|
|
popd
|
2023-02-17 11:55:51 -06:00
|
|
|
git merge sync_from_rust -m "Sync from rust $RUST_VERS"
|
2020-11-27 13:48:53 -06:00
|
|
|
git branch -d sync_from_rust
|
|
|
|
;;
|
2020-01-15 12:42:10 -06:00
|
|
|
*)
|
|
|
|
echo "Unknown command '$1'"
|
|
|
|
echo "Usage: ./rustup.sh prepare|commit"
|
|
|
|
;;
|
|
|
|
esac
|