Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[25.x] Backports #27887

Merged
merged 6 commits into from Jun 16, 2023
Merged

[25.x] Backports #27887

merged 6 commits into from Jun 16, 2023

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Jun 14, 2023 •
edited

@fanquake fanquake added this to the 25.1 milestone Jun 14, 2023
@DrahtBot
Copy link
Contributor

DrahtBot commented Jun 14, 2023 •
edited

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK stickies-v

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@fanquake fanquake mentioned this pull request Jun 14, 2023
Merged
stickies-v
stickies-v approved these changes Jun 14, 2023
View reviewed changes
Copy link
Contributor

@stickies-v stickies-v left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK f74ffc0

@fanquake fanquake mentioned this pull request Jun 14, 2023
Merged
@maflcko
Copy link
Member

maflcko commented Jun 14, 2023

May also need 27777 and 27844 ?

MarcoFalke and others added 6 commits June 15, 2023 10:38
@fanquake
ci: Prune dangling images on RESTART_CI_DOCKER_BEFORE_RUN
71f626e 
Github-Pull: bitcoin#27777
Rebased-From: fa9c65a
@fanquake
ci: Use podman for persistent workers
de56daa 
Github-Pull: bitcoin#27777
Rebased-From: fa12307
@fanquake
ci: Use podman stop over podman kill
6f7a0ae 
This should avoid a race where the kill is not done when spinning up the
new container. podman stop waits 10 seconds by default.

Github-Pull: bitcoin#27844
Rebased-From: faaa627
@brunoerg @fanquake
rest: bugfix, fix crash error when calling /deploymentinfo
72ead86 
Github-Pull: bitcoin#27853
Rebased-From: ce887ea
@brunoerg @fanquake
test: add coverage for /deploymentinfo passing a blockhash
d845a3e 
Github-Pull: bitcoin#27853
Rebased-From: 7d452d8
@hebasto @fanquake
ci: Switch to amd64 container in "ARM" task
6233049 
Tee `arm_container` does not support 32-bit mode anymore.
See: bitcoin#27879

Github-Pull: bitcoin#27886
Rebased-From: 016fe6d
@fanquake
Copy link
Member Author

May also need 27777 and 27844 ?

Pulled them in.

stickies-v
stickies-v approved these changes Jun 15, 2023
View reviewed changes
Copy link
Contributor

@stickies-v stickies-v left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 6233049

For completeness, would also mention that it backports #27562?

@fanquake
Copy link
Member Author

For completeness, would also mention that it backports #27562?

Added to the PR description.

@fanquake fanquake merged commit 642b5dd into bitcoin:25.x Jun 16, 2023
16 checks passed
@fanquake fanquake deleted the 25_x_bacports branch June 16, 2023 09:23
@maflcko maflcko mentioned this pull request Sep 5, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stickies-v stickies-v stickies-v approved these changes

Assignees
No one assigned
Labels
Backport
Projects
None yet
Milestone
25.1
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@fanquake @DrahtBot @maflcko @stickies-v @brunoerg @hebasto