Skip to content

Conversation

@nealrichardson
Copy link
Contributor

To see this in action, I'm working on an issue_comment workflow to rebase a PR. Using r-lib/actions/pr-push@master, the workflow failed because rebase needs force push, and then here's a successful run using this branch and passing args: "--force".

@codecov-io
Copy link

Codecov Report

Merging #90 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##            master       #90   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files            1         1           
  Lines            1         1           
=========================================
  Hits             1         1           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 880ee84...9185c86. Read the comment docs.

@jimhester
Copy link
Member

Thanks!

@jimhester jimhester merged commit 463f4ed into r-lib:master Apr 24, 2020
nealrichardson added a commit to apache/arrow that referenced this pull request Apr 24, 2020
Instead of adding a PR comment of "This needs rebase" and wait for the author to get around to it, with this workflow you can just type "rebase" and GHA will do it for you. If it rebases cleanly, the workflow force pushes; see [this demonstration](https://github.com/nealrichardson/arrow/runs/613698512?check_suite_focus=true#step:5:6) on my fork. If there are merge conflicts, well, the PR will probably tell you so you know not to try to auto-rebase, but if you do run this workflow and rebase is not clean, it exits with an error and does not push anything (see [this example](https://github.com/nealrichardson/arrow/runs/613691328?check_suite_focus=true)).

Relatedly, see r-lib/actions#90 where I add the ability to add args to `git push` in the action. This workflows is currently set to run using my fork, which is fine. If that PR is merged before this one is, we can switch back to using upstream; otherwise, I'll switch in ARROW-8489.

Recall that you can't test issue_comment workflow changes on PRs themselves because issue_comment workflows always run off of master, so if you make a "rebase" comment on this PR, it won't do anything.

Closes #7028 from nealrichardson/rebase

Authored-by: Neal Richardson <neal.p.richardson@gmail.com>
Signed-off-by: Neal Richardson <neal.p.richardson@gmail.com>
This was referenced Apr 27, 2020
alamb pushed a commit to apache/arrow-rs that referenced this pull request Apr 20, 2021
Instead of adding a PR comment of "This needs rebase" and wait for the author to get around to it, with this workflow you can just type "rebase" and GHA will do it for you. If it rebases cleanly, the workflow force pushes; see [this demonstration](https://github.com/nealrichardson/arrow/runs/613698512?check_suite_focus=true#step:5:6) on my fork. If there are merge conflicts, well, the PR will probably tell you so you know not to try to auto-rebase, but if you do run this workflow and rebase is not clean, it exits with an error and does not push anything (see [this example](https://github.com/nealrichardson/arrow/runs/613691328?check_suite_focus=true)).

Relatedly, see r-lib/actions#90 where I add the ability to add args to `git push` in the action. This workflows is currently set to run using my fork, which is fine. If that PR is merged before this one is, we can switch back to using upstream; otherwise, I'll switch in ARROW-8489.

Recall that you can't test issue_comment workflow changes on PRs themselves because issue_comment workflows always run off of master, so if you make a "rebase" comment on this PR, it won't do anything.

Closes #7028 from nealrichardson/rebase

Authored-by: Neal Richardson <neal.p.richardson@gmail.com>
Signed-off-by: Neal Richardson <neal.p.richardson@gmail.com>
@github-actions
Copy link

github-actions bot commented Nov 6, 2022

This pull request has been automatically locked. If you believe you have found a related problem, please file a new issue and include a link to this pull request.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 6, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants