Skip to content

[8.19](backport #7403) build(deps): bump github.com/oapi-codegen/runtime from 1.5.0 to 1.6.0 - #7429

Open
mergify[bot] wants to merge 1 commit into
8.19from
mergify/bp/8.19/pr-7403
Open

[8.19](backport #7403) build(deps): bump github.com/oapi-codegen/runtime from 1.5.0 to 1.6.0#7429
mergify[bot] wants to merge 1 commit into
8.19from
mergify/bp/8.19/pr-7403

Conversation

@mergify

@mergify mergify Bot commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

Bumps github.com/oapi-codegen/runtime from 1.5.0 to 1.6.0.

Release notes

Sourced from github.com/oapi-codegen/runtime's releases.

Allow customization of parameter encoding

This is a small release which adds a global encoding setting on the runtime, to allow users to customize how to handle spaces in query arguments. This is a new minor release, since we're adding new API, even though this is a very minor feature. I imagine that in the future, we will add more settings, rather than making behavior assumptions.

🚀 New features and improvements

📦 Dependency updates

  • chore(deps): update module github.com/golangci/golangci-lint to v2.12.2 (#112) @renovate[bot]

Sponsors

We would like to thank our sponsors for their support during this release.

Sponsors

We would like to thank our sponsors for their support during this release.

Commits
  • 01be2fa chore(deps): update module github.com/golangci/golangci-lint to v2.12.2 (#112)
  • 1463938 Allow customizing default query encoder (#145)
  • 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 #7403 done by [Mergify](https://mergify.com).

…#7403)

* build(deps): bump github.com/oapi-codegen/runtime from 1.5.0 to 1.6.0

Bumps [github.com/oapi-codegen/runtime](https://github.com/oapi-codegen/runtime) from 1.5.0 to 1.6.0.
- [Release notes](https://github.com/oapi-codegen/runtime/releases)
- [Commits](oapi-codegen/runtime@v1.5.0...v1.6.0)

---
updated-dependencies:
- dependency-name: github.com/oapi-codegen/runtime
  dependency-version: 1.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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>
Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com>
(cherry picked from commit c0bbdd3)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	go.sum
@mergify
mergify Bot requested a review from a team as a code owner July 21, 2026 20:49
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Jul 21, 2026
@mergify

mergify Bot commented Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of c0bbdd3 has failed:

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

You are currently cherry-picking commit c0bbdd3.
  (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:   testing/go.mod
	modified:   testing/go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE-fips.txt
	both modified:   NOTICE.txt
	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

@mergify
mergify Bot requested review from lorienhu and samuelvl July 21, 2026 20:49
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Jul 21, 2026
@github-actions github-actions Bot added automation dependency Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Jul 21, 2026
@github-actions

This comment has been minimized.

@github-actions

Copy link
Copy Markdown
Contributor

TL;DR

All six failed Buildkite jobs have the same root cause: PR #7429 contains unresolved Git conflict markers in go.mod. Go cannot parse the module file, so CI exits before linting, FIPS scanning, or packaging.

Remediation

  • Resolve the conflict in go.mod and the corresponding conflicts reported for go.sum, NOTICE.txt, and NOTICE-fips.txt, retaining the 8.19 branch dependencies plus the github.com/oapi-codegen/runtime v1.6.0 update.
  • Regenerate or update dependency notices and verify with go mod tidy (or the repository dependency workflow), then rerun Buildkite.
Investigation details

Root Cause

The PR head at commit 342ed52 has conflict markers in go.mod around the oapi-codegen runtime dependency (line 24): <<<<<<< HEAD, two competing versions (v1.4.2 and v1.6.0), and >>>>>>> c0bbdd3. The PR metadata also reports the branch as blocked with conflicts in NOTICE-fips.txt, NOTICE.txt, go.mod, and go.sum.

Evidence

  • Build: https://buildkite.com/elastic/fleet-server/builds/15614
  • Jobs: check-ci, Detect FIPS crypto imports, and all x86_64/aarch64 package jobs (regular and FIPS)
  • Key log excerpt: go: errors parsing go.mod: go.mod:24: malformed module path <<<<<<<: invalid char '<', followed by go.mod:26: usage: require module/path v1.2.3 and go.mod:29: usage: require module/path v1.2.3

Verification

Not run locally; the failure is directly established by the Buildkite logs and the PR head contents.


What is this? | From workflow: PR Buildkite Detective

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

@mergify

mergify Bot commented Jul 22, 2026

Copy link
Copy Markdown
Contributor Author

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.19/pr-7403 upstream/mergify/bp/8.19/pr-7403
git merge upstream/8.19
git push upstream mergify/bp/8.19/pr-7403

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.

0 participants