Agreed, feels like checks should still run even if there are conflicts, just with the understanding that the PR can't be merged until conflicts are fixed. And then checks would be run against the merged commit once the conflicts are fixed to ensure there are no failures once merged.
Unfortunately, this is how GitHub designed it, and from what I can tell there's no way to control it. From: https://docs.github.com/en/actions/reference/events-that-trigger-workflows#pull_request > Workflows will not run on pull_request activity if the pull request has a merge conflict. The merge conflict must be resolved first. I think users do just need to rebase and fix the conflicts. As to the dev branch issue, if we want to carry a PR on a separate dev branch, then the PR should be changed to be merged into the dev branch instead of the master branch. That way the PR checks will run as long as there are no conflicts with the dev branch, which should hopefully be less likely. On 7/30/21 11:17 AM, Beckerle, Mike wrote: > Ok, so to me this restriction is just plain wrong. > > A project that has multiple branches moving forward can't even work this way > at all. > > The tests to run are well defined for this change set. > > What if we decided to never merge it back to master, but instead start > carrying forward a dev branch separate from master? > > I don't want any contributor to have to rebase onto latest master until we > see that their stuff works, passes the checks, etc. Rebasing on top of master > will lose the history of comments on the PR. (all the commits change). That's > also a "bug" not a feature, but to live with that we have to simply not > rebase until very late in the game, and the current policy makes the > automated CI testing only workable if you rebase onto master frequently, > which we know is flawed. > > Am I incorrect here? > > > > > > ________________________________ > From: Interrante, John A (GE Research, US) <john.interra...@ge.com> > Sent: Friday, July 30, 2021 10:59 AM > To: dev@daffodil.apache.org <dev@daffodil.apache.org> > Subject: RE: trying to rerun checks on PR - no option for it? > > CI won't run when the PR has conflicts with the main branch. That's why the > button isn't there. Darryl needs to rebase his PR, fix the conflict, and > push his PR again with " git push --force-with-lease". > > From: Beckerle, Mike <mbecke...@owlcyberdefense.com> > Sent: Friday, July 30, 2021 10:51 AM > To: dev@daffodil.apache.org > Subject: EXT: trying to rerun checks on PR - no option for it? > > Darryl S. pushed a commit to his PR > https://github.com/apache/daffodil/pull/601/checks > > As a first time contributor, his checks won't automatically run. > > I was going to trigger them manually, but I see no option for doing so. > > Wasn't there a button for that? In the past I swear I saw one. > > Anybody understand what's up with this before I open an INFRA ticket? > > > Mike Beckerle | Principal Engineer > > [cid:9a6b4607-36da-4f6f-9218-104142fd8991] > > mbecke...@owlcyberdefense.com<mailto:bhum...@owlcyberdefense.com> > P +1-781-330-0412 > >
