Skip to content
Snippets Groups Projects

.oniro-ci: remove rules from .bitbake-workspace

Merged Zygmunt Krynicki requested to merge zyga/oniro:fix/manifest-branch-mr into kirkstone
1 file
+ 2
2
Compare changes
  • Side-by-side
  • Inline
  • 20eb5ab6
    Previous patch shows that the CI_ONIRO_MAGIC variable, when seen from
    the linux-qemu-x86 job, has the value
    ".oniro-ci/build-generic.yaml:96:.bitbake-workspace". This implies that
    the rule-specific variable defined in .gitlab-ci.yml, the
    .workspace-rules job, was ignored.
    
    Swap the order of entries in the extends declaration, to see if this has
    any effect.
    
    Signed-off-by: default avatarZygmunt Krynicki <zygmunt.krynicki@huawei.com>
+ 2
2
@@ -107,10 +107,10 @@ aggregate-docs:
# that replace the previous value.
.bitbake-workspace:
extends: [.workspace, .workspace-rules]
extends: [.workspace-rules, .workspace]
.build-rauc-bundle:
extends: [.build-image, .workspace-rules]
extends: [.workspace-rules, .build-image]
.publish-rauc-bundle-to-hawkbit:
extends: [.workspace-rules]
Loading