Open mergify[bot] opened 3 months ago
Cherry-pick of f40691cc4b50dc2d5d7c1875cc63653d0b3a902d has failed:
On branch mergify/bp/iron/pr-17
Your branch is up to date with 'origin/iron'.
You are currently cherry-picking commit f40691c.
(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)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: .github/workflows/docker.yml
no changes added to commit (use "git add" and/or "git commit -a")
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
Bumps docker/build-push-action from 6.5.0 to 6.6.1.
Release notes
Sourced from docker/build-push-action's releases.
Commits
16ebe77
Merge pull request #1205 from docker/dependabot/npm_and_yarn/docker/actions-t...646a62b
chore: update generated contentd92ab13
chore(deps): Bump@docker/actions-toolkit
from 0.37.0 to 0.37.14f7cdeb
Merge pull request #1198 from docker/dependabot/npm_and_yarn/docker/actions-t...ad3cd77
chore: update generated content3efbc13
chore(deps): Bump@docker/actions-toolkit
from 0.36.0 to 0.37.02dbe91d
Merge pull request #1197 from crazy-max/build-checks7de3854
chore: update generated content175aa53
opt to disable github annotations generation for build checks806a2a4
generate GitHub annotations for build checksDependabot 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 merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show
This is an automatic backport of pull request #17 done by [Mergify](https://mergify.com).