From f7b208357c9294b24b91a5bdf25206cf292657d7 Mon Sep 17 00:00:00 2001 From: Fredrik Svedberg Date: Thu, 13 Feb 2025 14:20:08 +0100 Subject: [PATCH] Fix DCO check for forks Fixed DCO checking for merge requests from forks. Change-Id: I94eadc5ef1287d1cc3cdd7680dfc8265bd5d137f Signed-off-by: Fredrik Svedberg --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 172b26b0..d1e41484 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,8 +127,10 @@ test-python: test-dco-check: stage: test + dependencies: [] script: + - if [ -z "$CI_COMMIT_BRANCH" ] && [ "$CI_MERGE_REQUEST_SOURCE_PROJECT_PATH" != "$CI_MERGE_REQUEST_PROJECT_PATH" ]; then export CI_COMMIT_BRANCH="$CI_MERGE_REQUEST_SOURCE_PROJECT_PATH:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"; fi - if [ -z "$CI_COMMIT_BRANCH" ]; then export CI_COMMIT_BRANCH="$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME"; fi - - if [ -z "$CI_MERGE_REQUEST_TARGET_BRANCH_SHA" ]; then export CI_MERGE_REQUEST_TARGET_BRANCH_SHA=$(git merge-base --fork-point origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME); fi + - if [ -z "$CI_MERGE_REQUEST_TARGET_BRANCH_SHA" ] && [ -n "$CI_MERGE_REQUEST_DIFF_BASE_SHA" ]; then export CI_MERGE_REQUEST_TARGET_BRANCH_SHA="$CI_MERGE_REQUEST_DIFF_BASE_SHA"; fi - pip install dco-check - dco-check -- GitLab