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.

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

Cherry picking to target branch release/v1.13.14-0.1.0.rc.3 #104

Closed
wants to merge 1 commit into from

Conversation

darioush
Copy link

@darioush darioush commented Jan 13, 2025

From @ARR4N:

  • See feat: release-branch automation #137
  • The base branch needs to be changed because it's currently main but that can wait until you create the release/v... branch so it's not just sitting there
  • params/version.libevm.go needs to be updated

@ARR4N
Copy link
Collaborator

ARR4N commented Jan 14, 2025

We need to only do cherry picking in release branches so they can be dropped once the original is included in the main branch. Ok for testing / communication of requirements, but please don't merge it otherwise we'll have problems later when there are two copies.

@qdm12 qdm12 added the Status: 🔴 DO NOT MERGE This PR is not meant to be merged in its current state label Feb 4, 2025
@qdm12
Copy link

qdm12 commented Feb 4, 2025

d10c4a3 is in #114 - can we close this PR?
I don't think a8ffd92 is needed for the coreth x libevm to work right?

@darioush
Copy link
Author

darioush commented Feb 4, 2025

I don't think a8ffd92 is needed for the coreth x libevm to work right?

At least some UTs fail, if I recall correctly, you are welcome to try ofc as I could be wrong

@qdm12 qdm12 force-pushed the darioush/libevm-phase-2.5 branch from d10c4a3 to d3f6a5e Compare February 10, 2025 14:00
@qdm12 qdm12 changed the title [wip] libevm phase 2.5 Cherry picking to target branch release/1.13.14-0.1.0.rc.3 Feb 10, 2025
@qdm12
Copy link

qdm12 commented Feb 10, 2025

I took the liberty to recycle this branch and PR to target the release/1.13.14-0.1.0.rc.3 branch.
I rebased this one on the main branch, cherry-picked geth commit ethereum@69f815f and forced-push it here.

We should keep this branch rebased at the tip of the main branch until we want to do this rc.3 release.

@qdm12 qdm12 force-pushed the darioush/libevm-phase-2.5 branch from 19ec675 to bd9b506 Compare February 14, 2025 08:18
@ARR4N ARR4N changed the title Cherry picking to target branch release/1.13.14-0.1.0.rc.3 Cherry picking to target branch release/v1.13.14-0.1.0.rc.3 Feb 14, 2025
@ARR4N
Copy link
Collaborator

ARR4N commented Feb 14, 2025

I would prefer that we use a fresh PR for the release branch. This has so much irrelevant history and an irrelevant source branch name.

@ARR4N ARR4N closed this Feb 14, 2025
@qdm12 qdm12 deleted the darioush/libevm-phase-2.5 branch February 17, 2025 09:15
@qdm12
Copy link

qdm12 commented Feb 17, 2025

Replaced by #142 thanks @ARR4N !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: 🔴 DO NOT MERGE This PR is not meant to be merged in its current state
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants