Closed
Description
Here we find the latest commit and merge with it before running a PR through CI to prevent merge conflicted PRs from taking up CI time.
tvm/ci/jenkins/Prepare.groovy.j2
Lines 17 to 26 in caf326f
This is fine except when we change the Jenkinsfile
that always comes from the PR's git merge-base origin/main <pr_commit>
, so if that references files that have been moved in the latest commit on main
there will be random CI failures like https://ci.tlcpack.ai/blue/organizations/jenkins/tvm/detail/PR-12648/3/pipeline/. To fix this we should either:
- don't merge at all and run the PR as is
- find the last 'safe' commit (i.e. the last commit between
origin/main
and thegit merge-base origin/main <pr_commit>
that has noJenkinsfile
modifications) and merge to that