From aa5d32880e07daffdb2acdf4b870fc267eb52bca Mon Sep 17 00:00:00 2001
From: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
Date: Mon, 6 Jun 2022 13:43:23 +0200
Subject: [PATCH] .oniro-ci: remove rules from .bitbake-workspace
Apparently those rules clash with the rules defined in the
.gitlab-ci.yml .workspace-rules, due to the order of evaluation inside
GitLab.
The set of rules on .bitbake-workspace is entirely redundant, and should
be defined by the workflow. The rules on .workspace-rules have a
different purpose, namely to inject specific variables into certian
types of pipelines.
Fixes: https://gitlab.eclipse.org/eclipse/oniro-core/oniro/-/issues/613
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
---
.oniro-ci/build-generic.yaml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/.oniro-ci/build-generic.yaml b/.oniro-ci/build-generic.yaml
index 8dbb59ac..efe0dcab 100644
--- a/.oniro-ci/build-generic.yaml
+++ b/.oniro-ci/build-generic.yaml
@@ -194,13 +194,6 @@
# them).
time devtool finish --remove-work --force "$CI_ONIRO_DEVTOOL_RECIPE_NAME" "$(basename "$CI_ONIRO_DEVTOOL_LAYER_PATH")";
fi
- rules:
- # Run the job when a merge request is created.
- - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- # Run the job when a tag is placed.
- - if: '$CI_COMMIT_TAG'
- # Run the build for scheduled pipelines.
- - if: '$CI_PIPELINE_SOURCE == "schedule"'
# This job is documented in docs/ci/hidden-jobs/build-linux.rst
.build-linux:
--
GitLab