From 39777975696483674aa2f8d48974a583f779b579 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Wed, 17 Nov 2021 11:14:17 +0000
Subject: [PATCH] ci/build-generic.yaml: Use GitLab variable for fork's
incoming remote
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
.oniro-ci/build-generic.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.oniro-ci/build-generic.yaml b/.oniro-ci/build-generic.yaml
index 12807864..630209ab 100644
--- a/.oniro-ci/build-generic.yaml
+++ b/.oniro-ci/build-generic.yaml
@@ -47,8 +47,8 @@
if [ -n "$CI_MERGE_REQUEST_SOURCE_PROJECT_URL" ]; then
echo "CI: Bootstrapping '$CI_PROJECT_DIR' as 'incoming-merged' remote in '$CI_ONIRO_GIT_REPO_PATH'";
( cd "$CI_ONIRO_GIT_REPO_PATH" \
- && git remote add incoming-merged "$CI_PROJECT_DIR" \
- && git fetch incoming-merged HEAD );
+ && git remote add incoming-merged "$CI_MERGE_REQUEST_SOURCE_PROJECT_URL" \
+ && git fetch incoming-merged );
fi;
echo "CI: Switching $CI_ONIRO_GIT_REPO_PATH to $CI_COMMIT_SHA";
( cd "$CI_ONIRO_GIT_REPO_PATH" && git checkout "$CI_COMMIT_SHA" );
--
GitLab