diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 89531864e312a289c6bdc7d3956021cc45ab3bf3..b8fd10eecca0ee75b65ad4e7cb7730b2430e185f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -217,7 +217,9 @@ build-docs: # thing we can do right now. - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' variables: - CI_ONIRO_REPO_WORKSPACE_LOCAL_MANIFEST: > + CI_ONIRO_REPO_WORKSPACE_LOCAL_MANIFEST_INTERPRETER: eval + CI_ONIRO_REPO_WORKSPACE_LOCAL_MANIFEST: | + cat <<__EOM__ <?xml version="1.0" encoding="UTF-8"?> <manifest> <!-- remove original docs project entry --> @@ -225,8 +227,9 @@ build-docs: <!-- add remote representing the project --> <remote name="oniro-override" fetch="${CI_MERGE_REQUEST_SOURCE_PROJECT_URL}/../" /> <!-- add docs at the exact version are testing --> - <project name="${CI_PROJECT_NAME}" path="docs" remote="oniro-override" revision="${CI_COMMIT_SHA}" /> + <project name="$(basename "$CI_MERGE_REQUEST_SOURCE_PROJECT_PATH")" path="docs" remote="oniro-override" revision="${CI_COMMIT_SHA}" /> </manifest> + __EOM__ # Or when things land. - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'