Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

force "HEAD" for non-CI and git_upstream_merge_base for CI environment #131358

Merged
merged 2 commits into from
Oct 13, 2024
Merged

force "HEAD" for non-CI and git_upstream_merge_base for CI environment #131358

merged 2 commits into from
Oct 13, 2024

Commits on Oct 12, 2024

  1. force "HEAD" for non-CI and git_upstream_merge_base for CI environment 

    When rust-lang/rust is configured as remote, some of the git
logic (for tracking changed files) that uses get_closest_merge_commit
starts to produce annoying results as the upstream branch becomes outdated
quickly (since it isn't updated with git pull). We can rely on HEAD for
non-CI environments as we specifically treat bors commits as merge commits,
which also exist on upstream. As for CI environments, we should use
`git_upstream_merge_base` to correctly track modified files as bors commits
may be in `HEAD` but not yet on the upstream remote.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
    @onur-ozkan
    onur-ozkan committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    33ac202 View commit details
    Browse the repository at this point in the history

  2. add new CI step: "setup upstream remote" 

    Signed-off-by: onur-ozkan <work@onurozkan.dev>
    @onur-ozkan
    onur-ozkan committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    4454fa9 View commit details
    Browse the repository at this point in the history