Skip to content

[9.4](backport #7324) build(deps): bump github.com/go-chi/chi/v5 from 5.3.0 to 5.3.1 - #7367

Open
mergify[bot] wants to merge 2 commits into
9.4from
mergify/bp/9.4/pr-7324
Open

[9.4](backport #7324) build(deps): bump github.com/go-chi/chi/v5 from 5.3.0 to 5.3.1#7367
mergify[bot] wants to merge 2 commits into
9.4from
mergify/bp/9.4/pr-7324

Conversation

@mergify

@mergify mergify Bot commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

Bumps github.com/go-chi/chi/v5 from 5.3.0 to 5.3.1.

Release notes

Sourced from github.com/go-chi/chi/v5's releases.

v5.3.1

What's Changed

New Contributors

Full Changelog: go-chi/chi@v5.3.0...v5.3.1

Commits
  • 8b258c7 ci: pin GitHub Actions to full commit SHAs (#1116)
  • caf87e6 feat(mux): support http QUERY method ietf rfc10008 (#1132)
  • 7fcb8a2 middleware: document printPrettyStack and harden NoColor panic test (#1131)
  • 878fe71 Fix defaultLogEntry.Panic not respecting NoColor setting (#1050)
  • d7b767b feat(middleware): add text/xml and application/xml to default compressible ty...
  • 3b50c7c Tidy build directives (#1113)
  • 2b9fca2 Honor Discard() in httpFancyWriter.ReadFrom (#1110)
  • See full diff in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

This is an automatic backport of pull request #7324 done by [Mergify](https://mergify.com).

* build(deps): bump github.com/go-chi/chi/v5 from 5.3.0 to 5.3.1

Bumps [github.com/go-chi/chi/v5](https://github.com/go-chi/chi) from 5.3.0 to 5.3.1.
- [Release notes](https://github.com/go-chi/chi/releases)
- [Changelog](https://github.com/go-chi/chi/blob/master/CHANGELOG.md)
- [Commits](go-chi/chi@v5.3.0...v5.3.1)

---
updated-dependencies:
- dependency-name: github.com/go-chi/chi/v5
  dependency-version: 5.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Post dependabot file modifications

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 50ae76b)

# Conflicts:
#	go.mod
#	go.sum
@mergify
mergify Bot requested a review from a team as a code owner July 15, 2026 12:15
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Jul 15, 2026
@mergify

mergify Bot commented Jul 15, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 50ae76b has failed:

On branch mergify/bp/9.4/pr-7324
Your branch is up to date with 'origin/9.4'.

You are currently cherry-picking commit 50ae76b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE-fips.txt
	modified:   NOTICE.txt

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions

This comment has been minimized.

@github-actions

Copy link
Copy Markdown
Contributor

TL;DR

All six failed Buildkite jobs share the same deterministic failure: PR #7367 contains unresolved Git conflict markers in go.mod and go.sum. Go stops parsing go.mod before any checks, tests, or packaging begin.

Remediation

  • Resolve the backport conflicts in go.mod and go.sum against the 9.4 base; retain github.com/fxamacker/cbor/v2 v2.9.1 and update github.com/go-chi/chi/v5 to v5.3.1.
  • Regenerate/update go.sum for that resolved module graph, remove all conflict-marker lines, and push the corrected backport commit.
  • Re-run the Buildkite checks and package jobs.
Investigation details

Root Cause

The PR head go.mod has an unresolved conflict block at lines 15-21. The base side selects fxamacker/cbor/v2 v2.9.1 and go-chi/chi/v5 v5.3.0; the cherry-picked side selects fxamacker/cbor/v2 v2.9.2 and go-chi/chi/v5 v5.3.1. go.sum contains the corresponding unresolved conflict block as well. This matches the PR merge-blocked status and its reported cherry-pick conflict.

Evidence

  • Build: https://buildkite.com/elastic/fleet-server/builds/15459
  • Jobs: check-ci, Detect FIPS crypto imports, and all four x86_64/aarch64 package variants
  • Key log excerpt: go.mod:15: malformed module path "<<<<<<<": invalid char '<'; subsequent errors report invalid require syntax at go.mod:18 and go.mod:21.
  • The PR diff explicitly adds unresolved conflict-marker lines to both module files.

Verification

  • Not run locally because this workflow is read-only and the checked-out workspace is not the PR head; Buildkite already reproduced the parse failure on the PR commit.

What is this? | From workflow: PR Buildkite Detective

Give us feedback! React with 🚀 if perfect, 👍 if helpful, 👎 if not.

@ebeahan

ebeahan commented Jul 21, 2026

Copy link
Copy Markdown
Member

@copilot fix the merge conflicts on this PR.

Copilot AI commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

@copilot fix the merge conflicts on this PR.

Fixed on commit 4cc4f4a9 by merging 9.4 into this branch and resolving the go.mod/go.sum conflict markers.

Copilot AI requested a review from ebeahan July 21, 2026 20:49
@ebeahan

ebeahan commented Jul 22, 2026

Copy link
Copy Markdown
Member

/test

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automation backport conflicts There is a conflict in the backported pull request dependency Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants