From 377761ca955d3cf19a04000ac23711268169f020 Mon Sep 17 00:00:00 2001 From: guf-gitbot <gitbot@garz-fricke.com> Date: Tue, 29 Jun 2021 17:53:55 +0000 Subject: [PATCH] Integrate gitlab-ci/show-instructions-if-merge-fails and 2 more -- Commit: https://gitlab.com/garz-fricke/yocto/infrastructure/gitlab-ci/-/commit/a497a5705c4cbfa2a03f5241fc79bc3c9f7869da deploy_gitlab_ci: show instructions if merge fails -- Commit: https://gitlab.com/garz-fricke/yocto/infrastructure/gitlab-ci/-/commit/01d10faba45c1cd1a69bff062d43aa1fa82562bd update_submodule: fix accidental multi-commits If integration branch already existed and had to be replaced, the new commit was accidentally pushed on top of the already existing commit instead of replacing it. Fixed this by checking out the master branch again before creating the commit. -- Commit: https://gitlab.com/garz-fricke/yocto/infrastructure/gitlab-ci/-/commit/d887beddab2db961e3d6e04cdf90c1b305bc0764 list_commits: replace "---" with "--" GitLab renders "---" as a horizontal line or as a frame. We do not want this, so replace it with "--". --- .gitlab-ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci b/.gitlab-ci index 4468328b..a497a570 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 4468328b8c41263fd02f45f803ab9abccc7a2571 +Subproject commit a497a5705c4cbfa2a03f5241fc79bc3c9f7869da -- GitLab