chore: merge origin/main into the campaign work

This commit is contained in:
Abdessamad Derraz committed 2026-10-27 13:02:18 +01:00
commit 5f3c836db9
26 files changed
+223 -135

No files matched your search

+4 -28
View File
@@ -43,7 +43,6 @@ import shlex
import shutil
import subprocess
import sys
import tempfile
import time
from collections.abc import Callable, Iterator, Sequence
from dataclasses import dataclass, field
@@ -74,7 +73,6 @@ SEGFAULT_CODES = (139, -11)
HOST_MISREAD_MARKERS = ("SystemError", "unknown opcode")
VOLATILE_KEYS = frozenset({"generated_at", "generated", "imported_at"})
SUBJECT_TYPES = re.compile(r"^(feat|refactor|chore|docs|fix): [a-z0-9]")
CI_RED = frozenset({"failure", "timed_out", "startup_failure"})
CI_GREEN = frozenset({"success", "skipped", "neutral"})
@@ -189,33 +187,11 @@ class Context:
def check_subject(subject: str, body: str = "") -> list[str]:
"""What the repository's commit-msg hook would refuse in this message.
"""What the repository's commit rules refuse in this message, checked
when the job list loads instead of two hours into the job."""
from commit_rules import problems # noqa: PLC0415
The hook holds the vocabulary rules, so they live in one place: a job
list is checked against it when it loads, not two hours into the job.
Without a hook (another clone) only the shape is checked.
"""
problems = []
if len(subject) > 50:
problems.append(f"subject is {len(subject)} characters, 50 at most")
if not SUBJECT_TYPES.match(subject):
problems.append("subject must read 'type: description'")
if re.search(r"^co-authored-by", body, re.IGNORECASE | re.MULTILINE):
problems.append("no Co-Authored-By trailer")
hook = subprocess.run(["git", "rev-parse", "--git-path", "hooks/commit-msg"],
capture_output=True, text=True, cwd=REPO_ROOT, check=False).stdout.strip()
hook_path = (REPO_ROOT / hook) if hook else None
if hook_path and hook_path.is_file() and os.access(hook_path, os.X_OK):
with tempfile.NamedTemporaryFile("w", suffix=".msg", delete=False) as message:
message.write(f"{subject}\n\n{body}\n" if body else f"{subject}\n")
try:
refused = subprocess.run([str(hook_path), message.name], capture_output=True,
text=True, check=False)
finally:
os.unlink(message.name)
if refused.returncode:
problems.append((refused.stderr or refused.stdout).strip() or "refused by commit-msg")
return problems
return problems(f"{subject}\n\n{body}" if body else subject)
def _step(raw: object, where: str) -> Step:
+54
View File
@@ -0,0 +1,54 @@
"""Commit message rules of this repository, in one place.
The local commit-msg hook calls this file, and autorun checks every job's
subject with it when the job list loads. Kept in the tree, the rules hold in
any clone and in CI: a copy in the hook alone left the runner checking only
the shape there.
Usage as a hook: python scripts/commit_rules.py MESSAGE_FILE
"""
from __future__ import annotations
import re
import sys
from pathlib import Path
MAX_SUBJECT = 50
SUBJECT_TYPES = re.compile(r"^(feat|refactor|chore|docs|fix): [a-z0-9]")
REFUSED_WORDS = re.compile(
r"\b(bug|regression|revert|dead code|broken|wrong|hack|workaround|"
r"comprehensive|implement)",
re.IGNORECASE,
)
CO_AUTHOR = re.compile(r"^co-authored-by", re.IGNORECASE | re.MULTILINE)
def problems(message: str) -> list[str]:
"""What this repository refuses in a commit message, first line first."""
found = []
subject = message.split("\n", 1)[0]
if len(subject) > MAX_SUBJECT:
found.append(f"subject is {len(subject)} characters, {MAX_SUBJECT} at most: {subject}")
if not SUBJECT_TYPES.match(subject):
found.append("subject must read 'type: description' (feat, refactor, chore, docs, fix)")
text = "\n".join(line for line in message.splitlines() if not line.startswith("#"))
if REFUSED_WORDS.search(text):
found.append("the message uses a word this repository's history does not carry")
if CO_AUTHOR.search(message):
found.append("no Co-Authored-By trailer here")
return found
def main(argv: list[str]) -> int:
if len(argv) != 2:
print("usage: commit_rules.py MESSAGE_FILE", file=sys.stderr)
return 2
found = problems(Path(argv[1]).read_text(encoding="utf-8", errors="replace"))
for problem in found:
print(f"commit-msg: {problem}", file=sys.stderr)
return 1 if found else 0
if __name__ == "__main__":
sys.exit(main(sys.argv))