From 1399d68cf133530810785a301e240cfc9938d36f Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Fri, 6 May 2022 13:47:30 +0000
Subject: [PATCH] Integrate gitlab-ci/fix-reuse-of-outdated-integration-branch
and 2 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/bcb6076bc67279ac451d5d0d3449bbc89c4830d6
CI: Add check if integration branch is on top of target branch before reusing it
The integration branch was reused even if there where new commits on the
target branch, which could lead into reverting some changes.
This adds a check, if the existing integration branch is directly based
on the target branch and deletes it if not.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3b5e9be0f5548af8ad42ab9b2701b7804c4cada6
CI: Pull new changelog_generator image, add token to the call.
BCS 746-000785
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/968886c04551d2dc5ee9d82298cd3f9d448402bf
Update README.md: Add description on the gitlab-ci CI and how to deploy
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 2 +-
SRCREV.conf | 26 +++++++++++++-------------
default.xml | 8 ++++----
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index f2b7ec90..bcb6076b 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit f2b7ec9024a50695f1e4daa3e4b52fe27112d96f
+Subproject commit bcb6076bc67279ac451d5d0d3449bbc89c4830d6
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14457d71..a01650c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,5 +4,5 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: f2b7ec9024a50695f1e4daa3e4b52fe27112d96f
+ ref: bcb6076bc67279ac451d5d0d3449bbc89c4830d6
file: 'manifest.yml'
diff --git a/SRCREV.conf b/SRCREV.conf
index 6983d6e7..7ed99246 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,13 +1,13 @@
-SRCREV_pn-gf-productiontests = "7805e292471eece3b3bd3c2f685f3be06ac5e9c7"
-SRCREV_pn-gfeeprom = "825667cf5fb9c2652033fb0425654510dee607c6"
-SRCREV_pn-guf-show-demo = "b5982cb1e29242f1611cad935d0cceaa30ab04e8"
-SRCREV_pn-libmdb = "b0f50cff46fb29498fa0de8cc8e670b33e87aa2a"
-SRCREV_pn-ltp-guf-tests = "0e8347362e684773a306d557ca2ca4cf4acd4383"
-SRCREV_pn-touchcal-conv = "9dcec2d6ae9a6831579466ce21d96d4567e2f025"
-SRCREV_pn-gfxml2dto = "10c050ed8f14f8611ee00c75270568330cb08f4b"
-SRCREV_pn-egalaxi2c = "08be7ab85312ad855fc82e07496fd12cdfa37fd5"
-SRCREV_pn-gfplatdetect = "7afa180b8d4886d552a65687bd42aec3152e7f55"
-SRCREV_pn-xconfig = "b6bd2557bcee455e633f59988bf247d703db240c"
-SRCREV_pn-linux-guf = "2f180fcac251ade03e65f2b306d4d657ec719ec4"
-SRCREV_pn-linux-imx-kuk = "4fbaa1aa5134600bc517976faca0ff275c7aa30e"
-SRCREV_pn-u-boot-imx = "5d0af46d84ac242d458cba3367f594693790fb71"
+SRCREV_pn-gf-productiontests = "77d90b5c3c346da7011447cf51d2c22ddd7114bd"
+SRCREV_pn-gfeeprom = "d31b0d2ff899ad9e47f8ec440f604f85d29f3ccc"
+SRCREV_pn-guf-show-demo = "f1454870310a2eb31e0db6ca0546b794b7ade923"
+SRCREV_pn-libmdb = "6164cb9a6b001610cadbac6c705bcce21ef50219"
+SRCREV_pn-ltp-guf-tests = "3acb03ec8a1663b06f291ee7c0dbe9aef3717e24"
+SRCREV_pn-touchcal-conv = "479498dc2c01dd95ebfaefbadea5ee904db3fddf"
+SRCREV_pn-gfxml2dto = "cd5e82e739ac5ad85384fdec397db3b27ca98644"
+SRCREV_pn-egalaxi2c = "8526c3e9e488921695f0876170a024d9557dcd57"
+SRCREV_pn-gfplatdetect = "6e8ded49c91d9017157dd40fc8d39c6078a58048"
+SRCREV_pn-xconfig = "0fc1ea45b55e729d551bb7d40dd25fbde02ee1b6"
+SRCREV_pn-linux-guf = "e118883d9f868c58af7f2aa74fa119701bef891d"
+SRCREV_pn-linux-imx-kuk = "1de98a1fb6d62528f03efb9b8c6f8ec7320da7ca"
+SRCREV_pn-u-boot-imx = "cbb5a903568388b397e3a9302ce8f003ee501902"
diff --git a/default.xml b/default.xml
index c25751fd..5f41037e 100644
--- a/default.xml
+++ b/default.xml
@@ -20,10 +20,10 @@
<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="2c7f91e601bf5cfc901c5bc6cf09a26e399794fb" remote="seco-ne" path="sources/meta-guf-machine" />
- <project name="layers/meta-guf-distro" revision="d1ed28e9eb1320f11a09f697a8442d70353c79d5" remote="seco-ne" path="sources/meta-guf-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="08568b3932419efe44fe3ff1961f4bd25526206a" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="86ec8872723d6a04007e9dc57a8f7eac4aec447b" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-guf-machine" revision="0f739ba73b4d9dbf4921f777791f087581a19109" remote="seco-ne" path="sources/meta-guf-machine" />
+ <project name="layers/meta-guf-distro" revision="74d926ac246e4d532896b407ed161ea3def827aa" remote="seco-ne" path="sources/meta-guf-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="215598fdd10a11dd3223fb95b2985cc854631f32" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="eccdc7b430ef01eaef9e81b8098b5251ce2ffc4f" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab