Skip to content

fix(ci): Fix docker builds (backport #4949)#4963

Merged
mergify[bot] merged 3 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-4949
Feb 19, 2025
Merged

fix(ci): Fix docker builds (backport #4949)#4963
mergify[bot] merged 3 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-4949

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Feb 19, 2025

Closes: #4950


PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments

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

Closes: #4950

---

#### PR checklist

- [x] Tests written/updated
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments

(cherry picked from commit 4226b0e)

# Conflicts:
#	DOCKER/Dockerfile
@mergify mergify bot added the conflicts label Feb 19, 2025
@mergify mergify bot requested a review from a team as a code owner February 19, 2025 13:39
@mergify mergify bot requested a review from a team February 19, 2025 13:39
@mergify mergify bot requested a review from a team as a code owner February 19, 2025 13:39
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Feb 19, 2025

Cherry-pick of 4226b0e has failed:

On branch mergify/bp/v0.38.x/pr-4949
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit 4226b0ea.
  (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:   .github/workflows/cometbft-docker.yml
	modified:   .github/workflows/testapp-docker.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   DOCKER/Dockerfile

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 merged commit 5521912 into v0.38.x Feb 19, 2025
20 checks passed
@mergify mergify bot deleted the mergify/bp/v0.38.x/pr-4949 branch February 19, 2025 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant