From ee81eb31cb6ff474d0e567ed276a0168feef1129 Mon Sep 17 00:00:00 2001 From: Lars Stommer Date: Mon, 26 Oct 2026 13:20:45 +0100 Subject: [PATCH] =?UTF-8?q?Produktionsziele=20k=C3=B6nnen=20Merge-Commit?= =?UTF-8?q?=20und=20Entwicklungsbranch=20verlangen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/cli.py | 9 +++++++++ tests/test_manager.py | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/manager/cli.py b/manager/cli.py index 0bc67de..4c143ad 100644 --- a/manager/cli.py +++ b/manager/cli.py @@ -231,6 +231,15 @@ def deploy(project, config, environment, archive, backup_root, transport_factory current = git(project, "ls-remote", "origin", ref).split() if not current or current[0] != revision: raise PipelineError("Veralteter Auftrag; Branch wurde inzwischen weitergeschoben.") + if target.get("require_merge", False): + parents = git(project, "show", "-s", "--format=%P", "HEAD").split() + if len(parents) != 2: + raise PipelineError("Dieses Ziel benötigt einen Merge-Commit.") + if target.get("source_branch"): + try: + git(project, "merge-base", "--is-ancestor", parents[1], "origin/" + target["source_branch"]) + except subprocess.CalledProcessError as error: + raise PipelineError("Merge stammt nicht vom vorgesehenen Entwicklungsbranch.") from error checksum = inspect_package(archive, config, revision) key_text = os.environ.get("DEPLOY_SSH_KEY", "") known_text = os.environ.get("DEPLOY_KNOWN_HOSTS", "") diff --git a/tests/test_manager.py b/tests/test_manager.py index ea12744..d08c12d 100644 --- a/tests/test_manager.py +++ b/tests/test_manager.py @@ -147,6 +147,13 @@ class ManagerTests(unittest.TestCase): with self.assertRaisesRegex(PipelineError, "Veralteter"): deploy(self.root, self.config, "staging", self.root / "missing", self.root) + def test_production_can_require_a_merge_instead_of_direct_commits(self): + self.config["targets"]["production"].update(enabled=True, require_merge=True) + with patch.dict(os.environ, {"GITHUB_REF": "refs/heads/main", "GITHUB_SHA": self.revision}): + with patch("manager.cli.git", side_effect=[self.revision, self.revision + "\trefs/heads/main", "b" * 40]): + with self.assertRaisesRegex(PipelineError, "Merge-Commit"): + deploy(self.root, self.config, "production", self.root / "missing", self.root) + def run_deployment(self, failure=None, healthy=True): archive = self.package() events = []