diff --git a/.oniro-ci/build-generic.yaml b/.oniro-ci/build-generic.yaml index ac98f51f98c6bebd240084f91b67e7c1fc5da534..2c80411e1251708f7e36b8745645e1f6b7f1dd9d 100644 --- a/.oniro-ci/build-generic.yaml +++ b/.oniro-ci/build-generic.yaml @@ -47,14 +47,12 @@ - | set -x if [ -n "$CI_ONIRO_GIT_REPO_PATH" ]; then - 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_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" ); + if [ ! -d "$CI_ONIRO_GIT_REPO_PATH/.git" ]; then + echo "Configuration error? $CI_ONIRO_GIT_REPO_PATH is not a git repository" + fi + echo "CI: Replacing $CI_ONIRO_GIT_REPO_PATH with $CI_PROJECT_DIR" + rm -rf "$CI_ONIRO_GIT_REPO_PATH" + ln -sf "$CI_PROJECT_DIR" "$CI_ONIRO_GIT_REPO_PATH" fi set +x