From 41980db1e3da412317d62237fac37ead854cf46e Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 15 Jul 2026 03:34:41 +0000 Subject: [PATCH] fix(ci): remove orphaned conflict marker in AUDIT.md breaking guards job MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit main's ci.yml `guards` job greps the whole tree for committed `<<<<<<< ` / `>>>>>>> ` merge-conflict markers (excluding only ci.yml). `.github/workflows/AUDIT.md:24` carried a stray orphaned `<<<<<<< HEAD` line — no matching separator — inside a documentation table. That single line makes the guards job fail on main itself, and every PR inherits the red check, which (with branch protection) blocks the entire merge queue. Prior conflict-marker fixes scanned code files and missed this workflow doc. Removing the one line restores a clean, continuous table and turns the guards job green. Co-Authored-By: Claude Opus 4.8 (1M context) Claude-Session: https://claude.ai/code/session_01WdTF5JRWGfV3T5fxqoekWm --- .github/workflows/AUDIT.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/AUDIT.md b/.github/workflows/AUDIT.md index c4cf7a313..55a721aa4 100644 --- a/.github/workflows/AUDIT.md +++ b/.github/workflows/AUDIT.md @@ -21,7 +21,6 @@ concrete reason, verified against the actual repository tree. | `dependency-review.yml` | KEEP | PR dependency review with documented allow-lists. | | `deploy-cloud-run.yml` | KEEP | The real deployment path (GCP Cloud Run); manual dispatch. | | `deploy.yml` | **DELETE** | References a non-existent `deployments/` tree (manifests/terraform); actual infra is `infrastructure/`. The validate job hard-`exit 1`s on missing manifests. Generic multi-cloud (AWS+Azure+Slack) scaffold that duplicates `deploy-cloud-run.yml`. | -<<<<<<< HEAD | `e2e-tests.yml` | **FIX** | Resolve the PR's Vercel preview deployment via the GitHub Deployments API before E2E runs, and skip the PR-comment step for forked `pull_request` runs where `GITHUB_TOKEN` is read-only (`Resource not accessible by integration`). Same-repo PRs still get comments. | | `emergency-stop.yml` | KEEP | Manual operational kill-switch with typed confirmation. | | `issue-triage.yml` | KEEP | Keyword auto-labeling + triage comment on new issues. |