Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions ci/jenkins/generated/arm_jenkinsfile.groovy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 14 additions & 10 deletions ci/jenkins/generated/cpu_jenkinsfile.groovy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 14 additions & 10 deletions ci/jenkins/generated/docker_jenkinsfile.groovy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 14 additions & 10 deletions ci/jenkins/generated/gpu_jenkinsfile.groovy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 14 additions & 10 deletions ci/jenkins/generated/wasm_jenkinsfile.groovy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 13 additions & 9 deletions ci/jenkins/templates/utils/Prepare.groovy.j2
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@ def init_git() {
)

// Determine merge commit to use for all stages
if (env.BRANCH_NAME == 'main') {
// Only set upstream_revision to HEAD and skip merging to avoid a race with another commit merged to main.
update_upstream_revision("HEAD")
if (env.CHANGE_TARGET) {
// This is a PR build, so merge with the latest of the PR's target branch
// (e.g. main or a release branch like v0.25.0).
merge_with_target()
} else {
// This is PR branch so merge with latest main.
merge_with_main()
// This is a branch build (main or a release branch). Only set
// upstream_revision to HEAD and skip merging to avoid a race with another
// commit merged to the branch.
update_upstream_revision("HEAD")
}

sh(
Expand All @@ -44,15 +47,16 @@ def update_upstream_revision(git_ref) {
}
}

def merge_with_main() {
def merge_with_target() {
def target = env.CHANGE_TARGET
sh (
script: 'git fetch origin main',
label: 'Fetch upstream',
script: "git fetch origin ${target}",
label: "Fetch target branch ${target}",
)
Comment thread
MasterJH5574 marked this conversation as resolved.
update_upstream_revision("FETCH_HEAD")
sh (
script: "git -c user.name=TVM-Jenkins -c user.email=jenkins@tvm.apache.org merge ${upstream_revision}",
label: 'Merge to origin/main'
label: "Merge to origin/${target}"
)
}

Expand Down