Merge pull request #50 from kaspar030/fix_merge_group_branch_extraction

specify remote for CI_BASE_BRANCH merge base
RIOT-OS · Nov 9, 2023 · 904a602 · 904a602
2 parents f0aae16 + 298f3f8
commit 904a602
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/build.sh b/build.sh
@@ -49,7 +49,7 @@ handle_merge_queue_build() {
 
         # Set CI_BASE_COMMIT in case of a merge queue build.
         if test -z "${CI_BASE_COMMIT}"; then
-            previous_merge="$(git -C ${repo_dir} merge-base ${CI_BASE_BRANCH} HEAD)"
+            previous_merge="$(git -C ${repo_dir} merge-base github/${CI_BASE_BRANCH} HEAD)"
             export CI_BASE_COMMIT="${previous_merge}"
         fi