Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions .github/workflows/pr-tracker-open-drafts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -674,11 +674,13 @@ jobs:
# same lines here after the draft was cut, often by folding the draft's
# content in by hand. No pull request is opened, the conflicting files are
# listed in the run summary with a compare link, and the job passes. The
# drafting side drafts the change again against the newer main on its next
# weekly run, while the code change is recent, and pushes a branch that
# applies if there is still something to add. If there is not, the old
# branch stays and is reported here each day until its metadata expires,
# as a warning rather than a failure. Before this, every such branch failed the run
# drafting side checks a parked draft on its next run: once the draft is
# about 30 hours old and still conflicts, it deletes this branch and drafts
# the change again against the newer main. After two redrafts that still
# conflict it drops the change and lists it in its Slack post, because a
# draft that keeps conflicting is almost always covered by a hand edit
# already. Until then the branch is reported here as a warning, not a
# failure. Before this, every such branch failed the run
# every day until its metadata expired (agentgateway/website run
# 37031254363: four drafts, all already covered by a hand edit the day
# before).
Expand Down Expand Up @@ -710,7 +712,7 @@ jobs:
# indented into the summary, never into a workflow command.
echo "::warning::${BRANCH} conflicts with newer edits on main; no pull request opened. See the run summary."
{
echo "- \`${BRANCH}\`: conflicts with newer edits on main, so no pull request was opened. The next drafting run redrafts it against main if the code change is still recent. Conflicting files:"
echo "- \`${BRANCH}\`: conflicts with newer edits on main, so no pull request was opened. Once the draft is about 30 hours old, the drafting pipeline deletes this branch and drafts the change again against main. After two redrafts that still conflict, it drops the change, which is most likely documented already. Conflicting files:"
printf '%s\n' "${conflicts}" | tr -d '`' | sed 's/^/ - `/; s/$/`/'
echo " Compare: https://github.com/${GITHUB_REPOSITORY}/compare/main...${FORK_REPO%%/*}:${FORK_REPO#*/}:${BRANCH}"
} >> "$GITHUB_STEP_SUMMARY"
Expand Down
2 changes: 1 addition & 1 deletion docs-site/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ go 1.21

require (
github.com/imfing/hextra v0.12.3 // indirect
github.com/solo-io/docs-theme-extras v0.3.17 // indirect
github.com/solo-io/docs-theme-extras v0.3.21 // indirect
)
2 changes: 2 additions & 0 deletions docs-site/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ github.com/solo-io/docs-theme-extras v0.3.17-beta.1 h1:d4uoaQqdvx2IZOSjKV9TgtFjI
github.com/solo-io/docs-theme-extras v0.3.17-beta.1/go.mod h1:jjjYu/QoD+vMu30zgcpfEuTEGuJOJWs5qai/K18kltg=
github.com/solo-io/docs-theme-extras v0.3.17 h1:SSfI0zexM1ac3XMKkj4em22lRZkjF+8C/0uXkSjaXp0=
github.com/solo-io/docs-theme-extras v0.3.17/go.mod h1:jjjYu/QoD+vMu30zgcpfEuTEGuJOJWs5qai/K18kltg=
github.com/solo-io/docs-theme-extras v0.3.21 h1:xrlebSvYNmS28RcCRXky6doiINfkYrIJ1Kxk73YoanA=
github.com/solo-io/docs-theme-extras v0.3.21/go.mod h1:jjjYu/QoD+vMu30zgcpfEuTEGuJOJWs5qai/K18kltg=
Loading