[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stable-7.2.6 01/51] gitlab-ci: check-dco.py: switch from master to stab
From: |
Michael Tokarev |
Subject: |
[Stable-7.2.6 01/51] gitlab-ci: check-dco.py: switch from master to stable-7.2 branch |
Date: |
Mon, 11 Sep 2023 11:01:52 +0300 |
There's one commit, tagged v7.2.2, without Signed-off-by line.
Due to this, check-dco test always fail on 7.2. Since this is
a stable branch with almost all commits coming from master
already with S-o-b (except of the version bumps and very rare
stable-specific commits), and v7.2.2 is already cast in stone,
let's base the check on stable-7.2 branch (with its last version)
instead of master branch. This way, staging-7.2 will be checked
against stable-7.2, but stable-7.2 itself will not be checked
anymore, - so we can catch errors during stable preparations.
Note: this is a change specific to stable-7.2 branch/series, it
is not supposed to be in master.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/.gitlab-ci.d/check-dco.py b/.gitlab-ci.d/check-dco.py
index 632c8bcce8..b929571eed 100755
--- a/.gitlab-ci.d/check-dco.py
+++ b/.gitlab-ci.d/check-dco.py
@@ -20,12 +20,12 @@
repourl = "https://gitlab.com/%s/%s.git" % (namespace, reponame)
subprocess.check_call(["git", "remote", "add", "check-dco", repourl])
-subprocess.check_call(["git", "fetch", "check-dco", "master"],
+subprocess.check_call(["git", "fetch", "check-dco", "stable-7.2"],
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL)
ancestor = subprocess.check_output(["git", "merge-base",
- "check-dco/master", "HEAD"],
+ "check-dco/stable-7.2", "HEAD"],
universal_newlines=True)
ancestor = ancestor.strip()
@@ -85,7 +85,7 @@
To bulk update all commits on current branch "git rebase" can be used:
- git rebase -i master -x 'git commit --amend --no-edit -s'
+ git rebase -i stable-7.2 -x 'git commit --amend --no-edit -s'
""")
--
2.39.2
- [Stable-7.2.6 00/51] v2 Patch Round-up for stable 7.2.6, freeze on 2023-09-19, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 01/51] gitlab-ci: check-dco.py: switch from master to stable-7.2 branch,
Michael Tokarev <=
- [Stable-7.2.6 03/51] memory: prevent dma-reentracy issues, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 02/51] python: drop pipenv, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 06/51] checkpatch: add qemu_bh_new/aio_bh_new checks, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 05/51] async: avoid use-after-free on re-entrancy guard, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 04/51] async: Add an optional reentrancy guard to the BH API, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 07/51] hw: replace most qemu_bh_new calls with qemu_bh_new_guarded, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 08/51] lsi53c895a: disable reentrancy detection for script RAM, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 09/51] lsi53c895a: disable reentrancy detection for MMIO region, too, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 11/51] raven: disable reentrancy detection for iomem, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 10/51] bcm2835_property: disable reentrancy detection for iomem, Michael Tokarev, 2023/09/11