Skip to content
Snippets Groups Projects
Commit 7f887d55 authored by GitBot's avatar GitBot
Browse files

Integrate gitlab-ci/fix-branch-protection-check

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@23680f48

Fix check for branch protection state

Since the changes of 939ade2b9f98b3e1569332270a7ab16ce7d70b4a we observe
that pipelines are executed on non-protected branches, which is not what
we want.

GitLab's documentation was a bit unclear on the according CI variables
CI_COMMIT_REF_PROTECTED and CI_MERGE_REQUEST_TARGET_BRANCH_PROTECTED, as
stated in this stack overflow answer:
https://stackoverflow.com/a/59023344/3018229

We need to explicitly check for the variable values to be "true" instead
of just checking whether they are set.
parent f3fffaa5
No related branches found
No related tags found
2 merge requests!455CI: Update gitlab-ci,!302Integrate gitlab-ci/fix-branch-protection-check
Pipeline #61006 passed with stage
in 1 minute and 9 seconds
Subproject commit 939ade2b9f98b3e1569332270a7ab16ce7d70b4a
Subproject commit 23680f489b33d1fc2270958cf174f00701947774
......@@ -4,11 +4,11 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
ref: 939ade2b9f98b3e1569332270a7ab16ce7d70b4a
ref: 23680f489b33d1fc2270958cf174f00701947774
file: 'manifest-integration.yml'
variables:
GITLAB_CI_REVISION: 939ade2b9f98b3e1569332270a7ab16ce7d70b4a
GITLAB_CI_REVISION: 23680f489b33d1fc2270958cf174f00701947774
BB_RECIPE_NAME: linux-imx
# FIXME: This is only necessary due to the following GitLab limitation:
# https://gitlab.com/gitlab-org/gitlab/-/issues/209904
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment