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

Make it easier to pull upstream changes #1504

Closed
rootulp opened this issue Sep 25, 2024 · 0 comments · Fixed by #1505
Closed

Make it easier to pull upstream changes #1504

rootulp opened this issue Sep 25, 2024 · 0 comments · Fixed by #1505
Assignees
@rootulp

Comments

@rootulp
Copy link
Collaborator

rootulp commented Sep 25, 2024 •
edited
Loading

Context

#1495

Problem

There were merge conflicts for things in docs

Proposal

  1. Delete docs/
  2. Delete changelog/
  3. Delete CHANGELOG.md, UPGRADING.md, SECURITY.md, code of conduct,
  4. Update all Go versions in workflow files to use 'go.mod' instead of a version number
@rootulp rootulp self-assigned this Sep 25, 2024
This was referenced Sep 25, 2024
Merged
Merged
rootulp added a commit that referenced this issue Sep 30, 2024
@rootulp @mergify
@sergio-mena @dependabot @jmalicevic @lasarojc @thanethomson @mmsqe @yihuang @stevenferrer @chillyvee @alijnmerchant21 @p-offtermatt @cason @hvanz @adizere @ebuchman @andynog @melekes @troykessler @forcodedancing @mzabaluev @AlexsandroRyan @alesforz @faddat
chore: pull cometbft v0.34.35 (#1495)
65c778d 
Closes #1468 by
pulling upstream
[v0.34.35](https://github.com/cometbft/cometbft/releases/tag/v0.34.35)
with these notable merge conflicts:
- Our repo upgraded Go past what upstream has so I choose to retain the
more recent Go version

And these changes to make unit tests pass:
1. Refactor CI to run all tests in one execution. It takes the same time
([4
mins](https://github.com/celestiaorg/celestia-core/actions/runs/11038290102/job/30661243408?pr=1495))
as it [previously
did](https://github.com/celestiaorg/celestia-core/actions/runs/10956425121).
But now it's easier to reason about the flakes.
2. Included #1503
3. Included #1501

## FLUPs
1. #1504
2. Opens #1502 and
skips that test

## Testing

I used go mod replace and verified that celestia-app can use this
version of celestia-core.
- [x] `single-node.sh`
- [x] `mocha.sh`

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Thane Thomson <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Sergio Mena <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jasmina Malicevic <[email protected]>
Co-authored-by: Lasaro <[email protected]>
Co-authored-by: Thane Thomson <[email protected]>
Co-authored-by: mmsqe <[email protected]>
Co-authored-by: yihuang <[email protected]>
Co-authored-by: Steven Ferrer <[email protected]>
Co-authored-by: Chill Validation <[email protected]>
Co-authored-by: Aliasgar Merchant <[email protected]>
Co-authored-by: Philip Offtermatt <[email protected]>
Co-authored-by: Daniel <[email protected]>
Co-authored-by: Hernán Vanzetto <[email protected]>
Co-authored-by: Adi Seredinschi <[email protected]>
Co-authored-by: Ethan Buchman <[email protected]>
Co-authored-by: Andy Nogueira <[email protected]>
Co-authored-by: Anton Kaliaev <[email protected]>
Co-authored-by: Troy Kessler <[email protected]>
Co-authored-by: forcodedancing <[email protected]>
Co-authored-by: Mikhail Zabaluev <[email protected]>
Co-authored-by: Alexsandro <[email protected]>
Co-authored-by: Alessandro <[email protected]>
Co-authored-by: Jacob Gadikian <[email protected]>
rach-id pushed a commit that referenced this issue Nov 18, 2024
@rootulp @mergify
@sergio-mena @dependabot @jmalicevic @lasarojc @thanethomson @mmsqe @yihuang @stevenferrer @chillyvee @alijnmerchant21 @p-offtermatt @cason @hvanz @adizere @ebuchman @andynog @melekes @troykessler @forcodedancing @mzabaluev @AlexsandroRyan @alesforz @faddat @rach-id
chore: pull cometbft v0.34.35 (#1495)
e341292 
Closes #1468 by
pulling upstream
[v0.34.35](https://github.com/cometbft/cometbft/releases/tag/v0.34.35)
with these notable merge conflicts:
- Our repo upgraded Go past what upstream has so I choose to retain the
more recent Go version

And these changes to make unit tests pass:
1. Refactor CI to run all tests in one execution. It takes the same time
([4
mins](https://github.com/celestiaorg/celestia-core/actions/runs/11038290102/job/30661243408?pr=1495))
as it [previously
did](https://github.com/celestiaorg/celestia-core/actions/runs/10956425121).
But now it's easier to reason about the flakes.
2. Included #1503
3. Included #1501

## FLUPs
1. #1504
2. Opens #1502 and
skips that test

## Testing

I used go mod replace and verified that celestia-app can use this
version of celestia-core.
- [x] `single-node.sh`
- [x] `mocha.sh`

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Thane Thomson <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Sergio Mena <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jasmina Malicevic <[email protected]>
Co-authored-by: Lasaro <[email protected]>
Co-authored-by: Thane Thomson <[email protected]>
Co-authored-by: mmsqe <[email protected]>
Co-authored-by: yihuang <[email protected]>
Co-authored-by: Steven Ferrer <[email protected]>
Co-authored-by: Chill Validation <[email protected]>
Co-authored-by: Aliasgar Merchant <[email protected]>
Co-authored-by: Philip Offtermatt <[email protected]>
Co-authored-by: Daniel <[email protected]>
Co-authored-by: Hernán Vanzetto <[email protected]>
Co-authored-by: Adi Seredinschi <[email protected]>
Co-authored-by: Ethan Buchman <[email protected]>
Co-authored-by: Andy Nogueira <[email protected]>
Co-authored-by: Anton Kaliaev <[email protected]>
Co-authored-by: Troy Kessler <[email protected]>
Co-authored-by: forcodedancing <[email protected]>
Co-authored-by: Mikhail Zabaluev <[email protected]>
Co-authored-by: Alexsandro <[email protected]>
Co-authored-by: Alessandro <[email protected]>
Co-authored-by: Jacob Gadikian <[email protected]>
rach-id pushed a commit that referenced this issue Nov 18, 2024
@rootulp @rach-id
refactor: make it easier to fetch upstream changes (#1505)
e6fab07 
Closes #1504 by
deleting a bunch of files that we don't need to maintain in this fork.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@rootulp rootulp

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

refactor: make it easier to fetch upstream changes rootulp/celestia-core
1 participant
@rootulp