[issue40551] PRs should be rebased on top of master before running the build/tests

Change by Filipe Laíns : -- resolution: -> works for me stage: -> resolved status: open -> closed ___ Python tracker ___ ___ Python

[issue40551] PRs should be rebased on top of master before running the build/tests

Filipe Laíns added the comment: > Just like Travis, Github actions also automatically rebases pull requests > onto the latest master. As you can see from a recent workflow run, it uses > the special ref: "refs/remote/pull/20047/merge" > https://github.com/python/cpython/pull/20047/checks?chec

[issue40551] PRs should be rebased on top of master before running the build/tests

Ammar Askar added the comment: Just like Travis, Github actions also automatically rebases pull requests onto the latest master. As you can see from a recent workflow run, it uses the special ref: "refs/remote/pull/20047/merge" https://github.com/python/cpython/pull/20047/checks?check_run_id=

[issue40551] PRs should be rebased on top of master before running the build/tests

Filipe Laíns added the comment: > re-trigger the CI, to make everything works correctly with master. *re-trigger the CI, to make *sure* everything works correctly with master. -- ___ Python tracker _

[issue40551] PRs should be rebased on top of master before running the build/tests

Filipe Laíns added the comment: > "Rather than build the commits that have been pushed to the branch the pull request is from, we build the merge between the source branch and the upstream branch." Okay, great. But this still only happens for Linux. And still has the same problem, the build ne

[issue40551] PRs should be rebased on top of master before running the build/tests

Inada Naoki added the comment: On Sat, May 9, 2020 at 6:08 PM Filipe Laíns wrote: > > > * Travis-CI, at least, does test against "merge commit", not HEAD of PR > > branch. > > Where? https://github.com/python/cpython/blob/master/.travis.yml https://docs.travis-ci.com/user/pull-requests/ "Rat

[issue40551] PRs should be rebased on top of master before running the build/tests

Filipe Laíns added the comment: > * Travis-CI, at least, does test against "merge commit", not HEAD of PR > branch. Where? https://github.com/python/cpython/blob/master/.travis.yml > * As you said already, master branch grow after PR is created anyway. > This issue proposes " this only works

[issue40551] PRs should be rebased on top of master before running the build/tests

Inada Naoki added the comment: > See also > https://mail.python.org/archives/list/python-committ...@python.org/thread/WEU5CQKIA4LIHWHT53YA7HHNUY5H2FUT/. > This was a problem with other CI GitHub actions when a change had to be > merged to master with which all PRs need to be manually rebas

[issue40551] PRs should be rebased on top of master before running the build/tests

Karthikeyan Singaravelan added the comment: See also https://mail.python.org/archives/list/python-committ...@python.org/thread/WEU5CQKIA4LIHWHT53YA7HHNUY5H2FUT/. This was a problem with other CI GitHub actions when a change had to be merged to master with which all PRs need to be manually r

[issue40551] PRs should be rebased on top of master before running the build/tests

Inada Naoki added the comment: I don't think this is a real issue we should solve: * Travis-CI, at least, does test against "merge commit", not HEAD of PR branch. * As you said already, master branch grow after PR is created anyway. * We run CI and buildbots against master branch too. So we c

[issue40551] PRs should be rebased on top of master before running the build/tests

New submission from Filipe Laíns : Let's imagine this scenario: (master history) abcd - some commit hijk - change something (pull request history) abcd - some commit defg - add feature master pull request abcd - some commit --- defg -