From 298f3f8170052cca397d00e2ca170957cb4f8a7e Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Thu, 9 Nov 2023 12:30:26 +0100 Subject: [PATCH] specify remote for CI_BASE_BRANCH merge base --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index c1d885a..16149ea 100755 --- 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