Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • seco-ne/yocto/infrastructure/gitlab-ci
1 result
Show changes
Commits on Source (1)
......@@ -96,8 +96,8 @@ yamllint:
${PROJECT_ROOT}/tools/xconfig
${PROJECT_ROOT}/tools/qt-multi-screen-compositor
${PROJECT_ROOT}/yocto/config
${PROJECT_ROOT}/yocto/layers/meta-guf-distro
${PROJECT_ROOT}/yocto/layers/meta-guf-machine
${PROJECT_ROOT}/yocto/layers/meta-seconorth-distro
${PROJECT_ROOT}/yocto/layers/meta-seconorth-machine
${PROJECT_ROOT}/yocto/layers/meta-seconorth-nogplv3
${PROJECT_ROOT}/yocto/layers/meta-seconorth-dual-espresso
......
......@@ -28,16 +28,16 @@ Yocto distribution. A simplified version of the manifest file [`default.xml`][2]
/>
<project
name="layers/meta-guf-machine"
name="layers/meta-seconorth-machine"
revision="7aede82170ff7f92de0dcfeca89ed79849869214"
remote="seco-ne"
path="sources/meta-guf-machine"
path="sources/meta-seconorth-machine"
/>
<project
name="layers/meta-guf-distro"
name="layers/meta-seconorth-distro"
revision="c402d855fc8d47e3742ada3b0a3fda4b9649e414"
remote="seco-ne"
path="sources/meta-guf-distro"
path="sources/meta-seconorth-distro"
/>
</manifest>
```
......@@ -112,7 +112,7 @@ successfully.
[4]: https://docs.gitlab.com/ee/ci/pipelines/multi_project_pipelines.html
[5]: #merging-project-changes
[6]: https://git.seco.com/seco-ne/yocto/layers/meta-guf-distro/-/merge_requests/321
[6]: https://git.seco.com/seco-ne/yocto/layers/meta-seconorth-distro/-/merge_requests/321
<!----------------------------------------------------------------------------->
......
......@@ -38,11 +38,11 @@ def main():
# Get namespace from remote
# This is needed for cases where the remote URL contains a part of the project
# namespace (e.g. "ssh://git@gitlab.com/garz-fricke/yocto") and the project name
# contains another part of it (e.g. "layers/meta-guf-machine"). There is no GitLab
# API call which will find a project given this information.
# contains another part of it (e.g. "layers/meta-seconorth-machine"). There is no
# GitLab API call which will find a project given this information.
# Thus we are adding a possibility to parse the namespace from the remote and pre-
# pend it to the project name in order to return it including its complete namespace
# (e.g. "garz-fricke/yocto/layers/meta-guf-machine").
# (e.g. "garz-fricke/yocto/layers/meta-seconorth-machine").
if args.concat_namespaces:
remote = manifest.find("remote[@name='%s']" % args.remote)
if remote is None:
......