driazati opened a new issue, #12657: URL: https://github.com/apache/tvm/issues/12657
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. https://github.com/apache/tvm/blob/caf326fab2963dac8fe03d266ea33d323f4b4470/ci/jenkins/Prepare.groovy.j2#L17-L26 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: 1. don't merge at all and run the PR as is 2. find the last 'safe' commit (i.e. the last commit between `origin/main` and the `git merge-base origin/main <pr_commit>` that has no `Jenkinsfile` modifications -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
