From 776eb9ba0f982f4e28a9b51d02760aa88283984e Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@garz-fricke.com> Date: Mon, 6 Feb 2023 11:18:44 +0000 Subject: [PATCH] Integrate gitlab-ci/include-not-found-message and 1 more -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/ed36b4655636ee0b54edd1a282b3b7a6414815e2 mirror_mr_pipeline: include pipeline-not-found message in output -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/5ee69ab9117d1b8fc00f25ca3946e84287d799dc mirror_mr_pipeline: fix error when no pipeline found This case should trigger a new pipeline instead of reporting an error. --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- SRCREV.conf | 28 ++++++++++++++-------------- default.xml | 8 ++++---- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index e69d303e..ed36b465 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit e69d303eceade855375288a94d270958f3ae7785 +Subproject commit ed36b4655636ee0b54edd1a282b3b7a6414815e2 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccee6567..4f6295fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,13 +4,13 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: e69d303eceade855375288a94d270958f3ae7785 + ref: ed36b4655636ee0b54edd1a282b3b7a6414815e2 file: 'manifest-pipeline-yocto.yml' variables: MANIFEST_PROJECT_ID: 1725 MASTER_BRANCH: kirkstone - GITLAB_CI_REVISION: e69d303eceade855375288a94d270958f3ae7785 + GITLAB_CI_REVISION: ed36b4655636ee0b54edd1a282b3b7a6414815e2 generate-build-jobs: variables: diff --git a/SRCREV.conf b/SRCREV.conf index 7081a097..6012c133 100644 --- a/SRCREV.conf +++ b/SRCREV.conf @@ -1,15 +1,15 @@ -SRCREV:pn-egalaxi2c = "807d9bb7b6dfa2975513f35145affe9573d2063a" -SRCREV:pn-emc-test-suite = "be40f550a0b5323c3ff53d851d1585529ad66dc4" -SRCREV:pn-gf-productiontests = "dc2e541696b09255758e155ba9391d51503b3bdb" -SRCREV:pn-gfeeprom = "deeb0af3f2c41c547eea79c4d7b26e8f744caa18" -SRCREV:pn-gfplatdetect = "91f42eee3c34265735ece321050a74c095a3057f" -SRCREV:pn-gfxml2dto = "3156c08d4c4100a63f171d40cf82d93486204795" -SRCREV:pn-seco-show-demo = "aed6a1e6e6be34ec64c1520cc14282ad72cceb17" -SRCREV:pn-libmdb = "e3536972807856a41915fe2f9bede3668581dbbe" -SRCREV:pn-linux-seconorth = "086aa22a8f7b2596a78574a7120c6979d7e8df06" -SRCREV:pn-linux-imx = "5586270471d82e9079d86b0ca67ab16c73fb704b" +SRCREV:pn-egalaxi2c = "97508a82c073fafe758d7e60ac037d2bb4853dfe" +SRCREV:pn-emc-test-suite = "b48de9387561516ce68a1db52a4ddcbfe957b864" +SRCREV:pn-gf-productiontests = "d2d649361d8629459eee90691591df543e6a1b6e" +SRCREV:pn-gfeeprom = "40679c79431f0aafffcdb7de07510b19de922ec8" +SRCREV:pn-gfplatdetect = "46ba58bdc72eb3f0003cfc37e74c99d0ce471d43" +SRCREV:pn-gfxml2dto = "2d3efe6bc6b8fc19b0e7e3014c3bc17c932ff43f" +SRCREV:pn-seco-show-demo = "fa44861e774eee180b53440260e17fd54ae67c2a" +SRCREV:pn-libmdb = "693a53915cb62de30f0ac855e431eafa078371a9" +SRCREV:pn-linux-seconorth = "8eeb246038149f6994cdc1e27de9308161c1c92c" +SRCREV:pn-linux-imx = "7a0f44817a24fb2a7905c07867d3e1ddcac84d54" SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a" -SRCREV:pn-touchcal-conv = "a75131fd00d9325745d55bf16edc43585e5738e9" -SRCREV:pn-u-boot-imx = "5c7a98ccd312b0150e2c2a5c44ae70bb6ccab11f" -SRCREV:pn-xconfig = "602d8558e416bb8709f37c37933593e9eb3c2e41" -SRCREV:pn-qt-multi-screen-compositor = "4b0f956d23d38c154ffe52c9530c2228da0c512f" +SRCREV:pn-touchcal-conv = "f84dcb4b5efa8127dc99e19d8c64168e92489f6a" +SRCREV:pn-u-boot-imx = "ff16ecef815d7ca0cd244d9e54de2221085f7bc6" +SRCREV:pn-xconfig = "e3165e139c38e11f7ba8a4938251373406ec8a8d" +SRCREV:pn-qt-multi-screen-compositor = "74bfd56d8094e11b8417716c8653c7eadfef1844" diff --git a/default.xml b/default.xml index 54c83fc1..b101e7f1 100644 --- a/default.xml +++ b/default.xml @@ -21,10 +21,10 @@ <project name="meta-qt5.git" revision="5b71df60e523423b9df6793de9387f87a149ac42" remote="qt5-github" path="sources/meta-qt5" /> <project name="meta-freescale.git" revision="dd98526300937450d741c9b3403799632f417226" remote="fslc" path="sources/meta-freescale" /> <project name="meta-freescale-distro.git" revision="fc15f5003043da23212596be7366ae2547c308ad" remote="fslc" path="sources/meta-freescale-distro" /> - <project name="layers/meta-seconorth-machine" revision="2dbe708ecf37f1cafddfcb4ff0ab5c2b54541714" remote="seco-ne" path="sources/meta-seconorth-machine" /> - <project name="layers/meta-seconorth-distro" revision="824ec7371e8a93eb94258c689f3a4f9af747970d" remote="seco-ne" path="sources/meta-seconorth-distro" /> - <project name="layers/meta-seconorth-nogplv3" revision="53f4996905c4150dafbce5a92296ee7a3bdbf9d5" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> - <project name="config" revision="d3286d0c7abe7097b073d80c617e377d861ec44f" remote="seco-ne" path=".conf" > + <project name="layers/meta-seconorth-machine" revision="c4950f6795e4dd870f0f4352db3c212089c40cc1" remote="seco-ne" path="sources/meta-seconorth-machine" /> + <project name="layers/meta-seconorth-distro" revision="b6566cecad49c43be009c1971922a26a9d4b1a97" remote="seco-ne" path="sources/meta-seconorth-distro" /> + <project name="layers/meta-seconorth-nogplv3" revision="3a2de2e7ce3a2a226c9972906f0c1ef37258db20" remote="seco-ne" path="sources/meta-seconorth-nogplv3" /> + <project name="config" revision="1bf7c656ca7e8b4629770e5442858c61a8124c99" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment" /> </project> -- GitLab