| Message ID | 20231008132320.762542-1-dmitry.baryshkov@linaro.org |
|---|---|
| State | Accepted |
| Commit | f9b4fbcb4567ed5fc4af76b5ef82b71417ff9adf |
| Headers | show |
| Series | [1/2] drm/ci: pick up -external-fixes from the merge target repo | expand |
On Sun, 08 Oct 2023 16:23:19 +0300, Dmitry Baryshkov wrote: > 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. > > [...] Applied to drm/drm-misc (drm-misc-next). Thanks! Maxime
diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh index 7b014287a041..20a6ba8a7b04 100644 --- a/drivers/gpu/drm/ci/build.sh +++ b/drivers/gpu/drm/ci/build.sh @@ -64,10 +64,15 @@ if [ "$(git ls-remote --exit-code --heads ${UPSTREAM_REPO} ${TARGET_BRANCH}-exte fi # Try to merge fixes from local repo if this isn't a merge request +# otherwise try merging the fixes from the merge target if [ -z "$CI_MERGE_REQUEST_PROJECT_PATH" ]; then if [ "$(git ls-remote --exit-code --heads origin ${TARGET_BRANCH}-external-fixes)" ]; then git pull origin ${TARGET_BRANCH}-external-fixes fi +else + if [ "$(git ls-remote --exit-code --heads ${CI_MERGE_REQUEST_PROJECT_URL} ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}-external-fixes)" ]; then + git pull ${CI_MERGE_REQUEST_PROJECT_URL} ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}-external-fixes + fi fi for opt in $ENABLE_KCONFIGS; do
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> --- drivers/gpu/drm/ci/build.sh | 5 +++++ 1 file changed, 5 insertions(+)