From 8d96a42a1a3c9ee8a7999e04929a62ea80fa7279 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Wed, 1 Jun 2022 15:23:30 +0000
Subject: [PATCH] Integrate gitlab-ci/update-dual-espresso-path and 1 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/e6980d48ee67bafe2049ca9d36820070bc1479d1
Update meta-seconorth-dual-espresso path
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/83002e072589dcdac9237a8e4095da2a2904da62
accept_merge_request: explicitly check if MR has merge conflicts
According to the documentation [1] we should get a 406 error from the
API if we try to merge a merge request which has a merge conflict. We
are experiencing a different behaviour, though, where we are getting a
405 error in this case. There is an open GitLab issue on this topic [2].
In our error handling we assumed that the reason for a 405 error is most
likely a required pipeline which is still running. This assumtion,
however, leads to wrong behaviour in cases where no pipeline is started
at all.
Fixing this now by explicitly checking for merge conflicts at the very
beginning of the error handling sequence.
[1]: https://docs.gitlab.com/ee/api/merge_requests.html#merge-a-merge-request
[2]: https://gitlab.com/gitlab-org/gitlab/-/issues/364102
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 0885629..e6980d4 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 0885629d15caf5bfe0b91bff3b55dbb260def2e9
+Subproject commit e6980d48ee67bafe2049ca9d36820070bc1479d1
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61c3927..862b6d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 0885629d15caf5bfe0b91bff3b55dbb260def2e9
+ ref: e6980d48ee67bafe2049ca9d36820070bc1479d1
file: 'manifest-integration.yml'
variables:
--
GitLab