[8.19](backport #7403) build(deps): bump github.com/oapi-codegen/runtime from 1.5.0 to 1.6.0 - #7429
[8.19](backport #7403) build(deps): bump github.com/oapi-codegen/runtime from 1.5.0 to 1.6.0#7429mergify[bot] wants to merge 1 commit into
Conversation
…#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
|
Cherry-pick of c0bbdd3 has failed: 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 |
This comment has been minimized.
This comment has been minimized.
TL;DRAll 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
Investigation detailsRoot CauseThe 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
VerificationNot 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. |
|
This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏 |
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.
Commits
01be2fachore(deps): update module github.com/golangci/golangci-lint to v2.12.2 (#112)1463938Allow customizing default query encoder (#145)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 rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill 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 versionwill 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 dependencywill 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).