Conversation
| git merge sync_from_rust -m "Sync from rust $RUST_VERS" | ||
| git branch -d sync_from_rust | ||
| git checkout -b sync_from_rust | ||
| rustc-josh-sync pull |
There was a problem hiding this comment.
I needed GIT_CONFIG_GLOBAL=../rust/josh.gitconfig RUSTC_GIT=../rust too. The GIT_CONFIG_GLOBAL could be removed once rustc-josh-sync has native SSH support.
| echo "=> Uninstalling all old nightlies" | ||
| for nightly in $(rustup toolchain list | grep nightly | grep -v "$TOOLCHAIN" | grep -v nightly-x86_64); do | ||
| rustup toolchain uninstall "$nightly" | ||
| done |
There was a problem hiding this comment.
Please keep the install new nightly (does rustup toolchain install work to install the toolchain in rust-toolchain.toml?) and uninstall old nightlies code.
There was a problem hiding this comment.
In theory, there's a risk of desyncing the nightly version vs what the pull will install (though in practice it should be the same). rustup toolchain install seems to work, maybe we can just run it after a pull?
There was a problem hiding this comment.
I would prefer doing it in prepare to also run it if a merge conflict happened. Merge conflicts are the reason pull and prepare are separate steps.
| "commit") | ||
| git add rust-toolchain.toml | ||
| git commit -m "Rustup to $(rustc -V)" | ||
| ;; |
There was a problem hiding this comment.
If there is a merge conflict, what state does rustc-josh-sync leave the repo in? Does it pre-populate the commit message and does it stage the rust-toolchain.toml and rust-version changes?
2 participants
I think that most of the old stuff should be unnecessary now?