From 2106ffd5db0e0f9d207657c3627e8680f20afa11 Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@garz-fricke.com> Date: Tue, 12 Apr 2022 13:47:25 +0000 Subject: [PATCH] Integrate gitlab-ci/fix-remote-name-on-retrigger -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/c917791bc6d4a9494db5a393604ab9da23dee22c Fix remote name on retrigger stage --- .gitlab-ci | 2 +- .gitlab-ci.yml | 2 +- SRCREV.conf | 26 +++++++++++++------------- default.xml | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index 1ba52853..c917791b 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 1ba5285343c5b1252cd417067f53c6b917e6f0e8 +Subproject commit c917791bc6d4a9494db5a393604ab9da23dee22c diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a980a235..fb6ceb16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,5 +4,5 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 1ba5285343c5b1252cd417067f53c6b917e6f0e8 + ref: c917791bc6d4a9494db5a393604ab9da23dee22c file: 'manifest.yml' diff --git a/SRCREV.conf b/SRCREV.conf index 6d63d6ab..48fd755c 100644 --- a/SRCREV.conf +++ b/SRCREV.conf @@ -1,13 +1,13 @@ -SRCREV_pn-gf-productiontests = "08fb1a101fcfec731d5daf1bfef2a21ffd63c8c5" -SRCREV_pn-gfeeprom = "43403c24d678dec37df4dc913322627332ac01bf" -SRCREV_pn-guf-show-demo = "8f96c71cd7e209d9965b1744a7aadc3511d6f372" -SRCREV_pn-libmdb = "1513fd9431b89c635797271582b27775ce946e06" -SRCREV_pn-ltp-guf-tests = "8d7e74b3e9000d7d5798ed5ccb78dd7df548e041" -SRCREV_pn-touchcal-conv = "0ffaacec214a5c1d3f02d9771d4175a3e45da8c7" -SRCREV_pn-gfxml2dto = "3b71f333de1ae20961330828f87b8f3aa28ef9cd" -SRCREV_pn-egalaxi2c = "d3ca80c3a6b72a102913046d348418fce7fe5cff" -SRCREV_pn-gfplatdetect = "5cf1e0feb3ebd7f6808438ca7f6f37e441ea924f" -SRCREV_pn-xconfig = "1c158b145ec69d9b1205ecc1ca013e0e111e6798" -SRCREV_pn-linux-guf = "e9b1535cadefb74c9bac3805de03e37608b41e7b" -SRCREV_pn-linux-imx-kuk = "59460b4cde0ebcbbd6f84512f827cac64974c989" -SRCREV_pn-u-boot-imx = "9a46aead9ea675e123c8063231b555aca8ba970f" +SRCREV_pn-gf-productiontests = "376d5f94069388b7fda40d8219e417f67e5d2848" +SRCREV_pn-gfeeprom = "9b1898829c0260956826f920ce2fa997bf3fae37" +SRCREV_pn-guf-show-demo = "76411ab57a5f934458da71cd6769392bc606a10b" +SRCREV_pn-libmdb = "1b4cf2de2fcb3053e219a1aba02ab4360fd902c6" +SRCREV_pn-ltp-guf-tests = "cdf8e3265ae19b4836f9ab2054d89339b5b2b4f9" +SRCREV_pn-touchcal-conv = "544e5d7fb198ad12e4dc26942add6902198cda80" +SRCREV_pn-gfxml2dto = "3b1693245524c13752ebb41d3d17ee153bc1477c" +SRCREV_pn-egalaxi2c = "982d0a16bf232bbac02ca96a6a72234cb4a4a3bc" +SRCREV_pn-gfplatdetect = "4925c291b85edf7af396c2b0f89f15b56901137b" +SRCREV_pn-xconfig = "ed190e1978e6d75171f2ae1dbdf403718c1cebf8" +SRCREV_pn-linux-guf = "4d8ae1d1fcfac720aecc83bb40c1ac0f212d2fac" +SRCREV_pn-linux-imx-kuk = "371f7de8e6a1c52d426d2e0b791db80e0e951e43" +SRCREV_pn-u-boot-imx = "53e98f546e8457957c44baefae022664e4310c20" diff --git a/default.xml b/default.xml index baea6e60..1a346ec6 100644 --- a/default.xml +++ b/default.xml @@ -23,9 +23,9 @@ <project name="meta-qt5.git" revision="10f3673fd4b6c6e1e61c23478802f83652475a5f" remote="qt5-github" path="sources/meta-qt5" /> <project name="meta-freescale.git" revision="5a026be5a6b29a27a7754d7fa5d4765c99f98ed9" remote="fslc" path="sources/meta-freescale" /> <project name="meta-freescale-distro.git" revision="5d882cdf079b3bde0bd9869ce3ca3db411acbf3b" remote="fslc" path="sources/meta-freescale-distro" /> - <project name="layers/meta-guf-machine" revision="dab5053e82253e6962e4196ce777b381412d727b" remote="seco-ne" path="sources/meta-guf-machine" /> - <project name="layers/meta-guf-distro" revision="8c3fe8f8f9739bfd55f9356daadb02212215e6a2" remote="seco-ne" path="sources/meta-guf-distro" /> - <project name="config" revision="8d06400771cfbcc835733c31148bf4bd85e30a43" remote="seco-ne" path=".conf" > + <project name="layers/meta-guf-machine" revision="de5f4d6e9a62fc1351f34fecac534712b12cd418" remote="seco-ne" path="sources/meta-guf-machine" /> + <project name="layers/meta-guf-distro" revision="494a96c4ce666c4bc0b19c6bacebe26082b67ac4" remote="seco-ne" path="sources/meta-guf-distro" /> + <project name="config" revision="fca0f7583b68b06ae6820910e41620c470a74ec3" remote="seco-ne" path=".conf" > <linkfile dest="setup-environment" src="setup-environment"/> </project> </manifest> -- GitLab