From 48db374024ef54826ee06d5d84693bcbed634c6a Mon Sep 17 00:00:00 2001 From: Yuriy Andamasov Date: Thu, 14 May 2026 03:12:04 +0300 Subject: ci(workflows): remove conflict markers from update-version-tags.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `.github/workflows/update-version-tags.yml` has carried literal git conflict markers in its YAML header since the Mergify auto-backport in #1988 (cherry-pick of #1984 onto circinus) — the cherry-pick conflicted, but Mergify's `ignore_conflicts: true` default at the time committed the markers verbatim into the file. (The central Mergify config switched to `ignore_conflicts: false` a few days later as a direct response to this class of incident; #1988 had already merged.) Result: GitHub's YAML parser fails on `<<<<<<<` / `=======` / `>>>>>>>` and the workflow can't schedule any job. Every push to circinus touching `docs/**` or `context7.json` since #1988 merged reported "this run likely failed because of a workflow file issue" with 0 jobs. The downstream `context7-refresh.yml` (which uses `workflow_run` to react to this workflow's name) also never fired, so Context7's `1.5` index has been getting stale on every doc push. Fix: replace the file with rolling's verbatim content. The post-conflict-marker content on circinus was already byte-identical to rolling; only the marker block + the obsolete comment block above it differ. Confirmed with `diff <(git show origin/rolling:.../update-version-tags.yml) <(...)` returning empty after stripping markers. After this merges: - `Update version tags` runs on every docs-affecting push to circinus, moves the `1.5` tag to HEAD. - `Context7 refresh` fires via `workflow_run` and refreshes the `1.5` index. 🤖 Generated by [robots](https://vyos.io) --- .github/workflows/update-version-tags.yml | 6 ------ 1 file changed, 6 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/update-version-tags.yml b/.github/workflows/update-version-tags.yml index bb8325f2..cf03c57a 100644 --- a/.github/workflows/update-version-tags.yml +++ b/.github/workflows/update-version-tags.yml @@ -1,10 +1,5 @@ name: Update version tags -<<<<<<< HEAD -# This workflow exists on rolling, circinus, and sagitta. -# Keep all three copies in sync — backport edits via Mergify -# (`@Mergifyio backport circinus sagitta`) or cherry-pick. -======= # context7-refresh.yml triggers via workflow_run on this workflow's name. # DO NOT rename the `name:` field above without updating context7-refresh.yml. # @@ -16,7 +11,6 @@ name: Update version tags # semantically correct — the tag still represents the latest docs state. # `context7.json` is included because changes to its `rules`, `folders`, or # `excludeFolders` affect what Context7 returns even when no .md files moved. ->>>>>>> 800acbfd (ci(context7): gate version-tag move + refresh on docs-only changes) on: push: -- cgit v1.2.3