-
Notifications
You must be signed in to change notification settings - Fork 349
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.
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
Android: Added syscall support #3992
Conversation
d2ac593
to
79a1e4d
Compare
Please don't rebase when there isn't a conflict. Github is terrible at dealing with force pushes so rebasing makes re-reviewing a lot harder. |
Looks good, thanks! Please squash the commits (with |
@rustbot author |
There were no conflicts at all, but for whatever reason the repository required to update the branch (can be set in the settings). This was blocking the merge ability. Right now I see the same button, but all the checks are green and the update isn't mandatory. |
79a1e4d
to
b8618fe
Compare
Seeing that once again, it seems that there's just an UI issue. While some checks are running, the message "This branch is out-of-date with the base branch" has a gray icon like it's mandatory while it isn't. |
@rustbot review |
No it doesn't block the merge, you can just ignore that message. |
That force-push has a diff, so when you squashed you didn't use |
Actually that force push diff is really strange, it goes in the wrong direction?!? What on Earth is github doing here... |
Or did you un-do your earlier rebase? That's not helpful, it just leads to even more diffs github can't deal with... |
Anyway diff still looks good, thanks for the PR! |
Shouldn't be since I used
Yeah, but the UI is the same as if it's mandatory. There's no way to distinguish these two cases while checks are running. That led me to thing that I had to update the branch first. It's only possible when it's finished, so the check mark is green even if there's the message. |
Buy the way, I see that this time you didn't use |
The main Rust repo won't switch, but most of the rest is slowly switching.
Very strange... but I think somehow your branch did get un-rebased. Maybe you did the rebase with the button in the github UI but didn't pull that change so when you did the squash locally and force-pushed that it undid what you did in the UI?
When there is an actual conflict github shows a list of files that have conflicts. It doesn't even start CI in that case. So that should be enough to distinguish the two cases. |
Indeed, just rechecked the bash history and found that I did: git fetch origin
git reset --hard android-syscall Note that no remote was provided, so technically it's noop. The local branch wasn't updated. Sorry for inconvenience (:
Unfortunately not so helpful, I wrote #3998 (comment) where explained the situation. Some repositories require updates even if there are no conflicts. But if the CI isn't triggered on mandatory updates, then it might be fine. Still it requires awareness about all GH behaviors which are easy to forget or simply don't know (: |
According to the issue's description I moved the whole
syscall
implementation into a separate file, so it's a little bit more than just "thread APIs". Anyway, all of these system calls are available on Android.Closes #3618.