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

Merge e2 #10170

Closed
wants to merge 8 commits into from
Closed

Merge e2 #10170

wants to merge 8 commits into from

Conversation

AskAlexSharov
Copy link
Collaborator

No description provided.

AskAlexSharov and others added 8 commits May 1, 2024 16:27
Fix a timing hole where torrents that get created before webseeds have
been downloaded don't get webseeds set.
Cherry-pick PR #10119 into the release

Co-authored-by: Marcello Ardizzone <marcelloardizzone@hotmail.it>
Fixes
#10157 (comment)

Problem was:
```
grep -r -l --exclude-dir=erigon-lib "^// Code generated by MockGen. DO NOT EDIT.$" . | xargs rm -r
```

was deleting the `mockgen` binary after it was built 🙃
fixes a 2nd regression introduced by -
#7593

- it generates duplicate struct types in the same package (check
screenshot below)
- also found a better way to fix the first regression with unused
imports (improvement over
#10091)

<img width="1438" alt="Screenshot 2024-04-30 at 17 30 42"
src="https://github.com/ledgerwatch/erigon/assets/94537774/154d484b-4b67-4104-8a6e-eac2423e1c0e">
@AskAlexSharov AskAlexSharov enabled auto-merge (squash) May 2, 2024 02:51
@AskAlexSharov AskAlexSharov requested a review from awskii May 2, 2024 02:51
@yperbasis
Copy link
Member

@VBulikov & I (to start with) will be managing the release process, including ensuring that all patch PRs are duplicated between main and release branches. We decided to merge PRs from release from main 1 by 1, instead of everything together. See also PR #10177.

@yperbasis yperbasis closed this May 2, 2024
auto-merge was automatically disabled May 2, 2024 07:38

Pull request was closed

@AskAlexSharov AskAlexSharov deleted the merge_e2 branch November 29, 2024 05:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants