Closed mergify[bot] closed 3 months ago
Cherry-pick of 4efc645c5da0a4876839310b61b1d28b359b919b has failed:
On branch mergify/bp/humble/pr-179
Your branch is up to date with 'origin/humble'.
You are currently cherry-picking commit 4efc645.
(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.yaml
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 5.4.0 to 6.0.0.
Release notes
Sourced from docker/build-push-action's releases.
Commits
c382f71
Merge pull request #1120 from crazy-max/build-summary5a5b70d
chore: update generated contentdc24cf9
don't generate summary for cloud driver667cb22
DOCKER_BUILD_NO_SUMMARY env to disable summaryd880b19
generate build summarye51051a
export build record and upload artifact86c2bd0
Merge pull request #1137 from docker/dependabot/npm_and_yarn/braces-3.0.3268d2b1
Merge pull request #1138 from docker/dependabot/npm_and_yarn/docker/actions-t...2b8dc7f
chore: update generated content840c12b
chore(deps): Bump@docker/actions-toolkit
from 0.25.1 to 0.26.0Dependabot 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 #179 done by [Mergify](https://mergify.com).