Skip to content

Commit 2e1f32f

Browse files
avoid merging master before the check for the sake of more determinism and simplification; pre-merge flows can be implemented on some other check
more context given in #17 (comment)
1 parent 38a33e5 commit 2e1f32f

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

check_dependent_project.sh

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -301,19 +301,6 @@ main() {
301301
git config --global user.email '<>'
302302
git config --global pull.rebase false
303303

304-
echo
305-
echo "merging master into the pr..."
306-
# Merge master into our branch so that the compilation takes into account how the code is going to
307-
# perform when the code for this pull request lands on the target branch (à la pre-merge pipelines).
308-
# Note that the target branch might not actually be master, but we default to it in the assumption
309-
# of the common case. This could be refined in the future.
310-
git fetch origin +master:master
311-
git fetch origin "+$CI_COMMIT_REF_NAME:$CI_COMMIT_REF_NAME"
312-
git checkout "$CI_COMMIT_REF_NAME"
313-
git merge master --verbose --no-edit -m "master was merged into the pr by check_dependent_project.sh main()"
314-
echo "merging master into the pr: done"
315-
echo
316-
317304
discover_our_crates
318305

319306
process_pr_description "$this_repo" "$CI_COMMIT_REF_NAME"

0 commit comments

Comments
 (0)