Skip to content

Commit

Permalink
.murdock: drop bors CI_BASE_BRANCH logic
Browse files Browse the repository at this point in the history
  • Loading branch information
kaspar030 committed Nov 9, 2023
1 parent f849816 commit a6c2bb8
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions .murdock
Original file line number Diff line number Diff line change
Expand Up @@ -192,17 +192,6 @@ is_merge_queue_build() {
startswith "gh-readonly-queue/" "${CI_BUILD_BRANCH}"
}

# Set CI_BASE_COMMIT in case of a merge queue build.
# This assumes that merge queue always adds a single merge commit (possibly itself
# including multiple merges for PRs) on the base branch.
# That git command outputs the hash of the second merge commit (the one before
# the topmost merge), which should be the base branch HEAD.
# (CI_BASE_COMMIT is used by `can_fast_ci_run.py` to only build changes.)
if test -z "${CI_BASE_COMMIT}" && is_merge_queue_build; then
previous_merge="$(git log --merges --max-count 1 --skip 1 --pretty=format:%H)"
export CI_BASE_COMMIT="${previous_merge}"
fi

# fullbuild logic
# non-full-builds are those where can_fast_ci_run might reduce the build
# automatically
Expand Down

0 comments on commit a6c2bb8

Please sign in to comment.