Skip to content

Commit f9b4fbc

Browse files
lumagmripard
authored andcommitted
drm/ci: pick up -external-fixes from the merge target repo
In case of the merge requests it might be useful to push repo-specific fixes which have not yet propagated to the -external-fixes branch in the main UPSTREAM_REPO. For example, in case of drm/msm development, we are staging fixes locally for testing, before pushing them to the drm/drm repo. Thus, if the CI run was triggered by merge request, also pick up the -external fixes basing on the the CI_MERGE target repo / and branch. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Acked-by: Helen Koike <helen.koike@collabora.com> Link: https://lore.kernel.org/r/20231008132320.762542-1-dmitry.baryshkov@linaro.org Signed-off-by: Maxime Ripard <mripard@kernel.org>
1 parent 51c2385 commit f9b4fbc

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

drivers/gpu/drm/ci/build.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,15 @@ if [ "$(git ls-remote --exit-code --heads ${UPSTREAM_REPO} ${TARGET_BRANCH}-exte
6464
fi
6565

6666
# Try to merge fixes from local repo if this isn't a merge request
67+
# otherwise try merging the fixes from the merge target
6768
if [ -z "$CI_MERGE_REQUEST_PROJECT_PATH" ]; then
6869
if [ "$(git ls-remote --exit-code --heads origin ${TARGET_BRANCH}-external-fixes)" ]; then
6970
git pull origin ${TARGET_BRANCH}-external-fixes
7071
fi
72+
else
73+
if [ "$(git ls-remote --exit-code --heads ${CI_MERGE_REQUEST_PROJECT_URL} ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}-external-fixes)" ]; then
74+
git pull ${CI_MERGE_REQUEST_PROJECT_URL} ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}-external-fixes
75+
fi
7176
fi
7277

7378
for opt in $ENABLE_KCONFIGS; do

0 commit comments

Comments
 (0)