Skip to content

Commit aaefc4e

Browse files
authored
Merge branch 'main' into feat/session-scope-config
2 parents d3fbc7b + 68c6156 commit aaefc4e

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/scripts/pr_intake_checks.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ module.exports = async ({ github, context, core }) => {
8888
blockingFindings.push(`Dangerous patch markers found (${dangerousProblems.length})`);
8989
}
9090
if (linearKeys.length === 0) {
91-
blockingFindings.push(
92-
"Missing Linear issue key reference (`RMN-<id>`, `CDV-<id>`, or `COM-<id>`) in PR title/body.",
91+
advisoryFindings.push(
92+
"Missing Linear issue key reference (`RMN-<id>`, `CDV-<id>`, or `COM-<id>`) in PR title/body (recommended for traceability, non-blocking).",
9393
);
9494
}
9595

@@ -156,7 +156,7 @@ module.exports = async ({ github, context, core }) => {
156156
"",
157157
"Action items:",
158158
"1. Complete required PR template sections/fields.",
159-
"2. Link this PR to exactly one active Linear issue key (`RMN-xxx`/`CDV-xxx`/`COM-xxx`).",
159+
"2. (Recommended) Link this PR to one active Linear issue key (`RMN-xxx`/`CDV-xxx`/`COM-xxx`) for traceability.",
160160
"3. Remove tabs, trailing whitespace, and merge conflict markers from added lines.",
161161
"4. Re-run local checks before pushing:",
162162
" - `./scripts/ci/rust_quality_gate.sh`",

docs/ci-map.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Merge-blocking checks should stay small and deterministic. Optional checks are u
127127

128128
- Keep merge-blocking checks deterministic and reproducible (`--locked` where applicable).
129129
- Keep merge-queue compatibility explicit by supporting `merge_group` on required workflows (`ci-run`, `sec-audit`, and `sec-codeql`).
130-
- Keep PRs mapped to Linear issue keys (`RMN-*`/`CDV-*`/`COM-*`) via PR intake checks.
130+
- Keep PRs mapped to Linear issue keys (`RMN-*`/`CDV-*`/`COM-*`) when available for traceability (recommended by PR intake checks, non-blocking).
131131
- Keep `deny.toml` advisory ignore entries in object form with explicit reasons (enforced by `deny_policy_guard.py`).
132132
- Keep deny ignore governance metadata current in `.github/security/deny-ignore-governance.json` (owner/reason/expiry/ticket enforced by `deny_policy_guard.py`).
133133
- Keep gitleaks allowlist governance metadata current in `.github/security/gitleaks-allowlist-governance.json` (owner/reason/expiry/ticket enforced by `secrets_governance_guard.py`).

docs/i18n/vi/ci-map.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Các kiểm tra chặn merge nên giữ nhỏ và mang tính quyết định. C
115115

116116
- Giữ các kiểm tra chặn merge mang tính quyết định và tái tạo được (`--locked` khi áp dụng được).
117117
- Đảm bảo tương thích merge queue bằng cách hỗ trợ `merge_group` cho các workflow bắt buộc (`ci-run`, `sec-audit`, `sec-codeql`).
118-
- Bắt buộc PR liên kết với Linear issue key (`RMN-*`/`CDV-*`/`COM-*`) qua PR intake checks.
118+
- Khuyến nghị PR liên kết với Linear issue key (`RMN-*`/`CDV-*`/`COM-*`) khi có để truy vết (PR intake checks chỉ cảnh báo, không chặn merge).
119119
- Bắt buộc entry `advisories.ignore` trong `deny.toml` dùng object có `id` + `reason` (được kiểm tra bởi `deny_policy_guard.py`).
120120
- Giữ metadata governance cho deny ignore trong `.github/security/deny-ignore-governance.json` luôn cập nhật (owner/reason/expiry/ticket được kiểm tra bởi `deny_policy_guard.py`).
121121
- Giữ metadata quản trị allowlist gitleaks trong `.github/security/gitleaks-allowlist-governance.json` luôn cập nhật (owner/reason/expiry/ticket được kiểm tra bởi `secrets_governance_guard.py`).

0 commit comments

Comments
 (0)