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

refactor: make it easier to fetch upstream changes #1505

Merged
merged 10 commits into from
Oct 21, 2024
Merged

refactor: make it easier to fetch upstream changes #1505

merged 10 commits into from
Oct 21, 2024

Conversation

rootulp
Copy link
Collaborator

@rootulp rootulp commented Sep 25, 2024

Closes #1504 by deleting a bunch of files that we don't need to maintain in this fork.

@rootulp rootulp self-assigned this Sep 25, 2024
@rootulp rootulp requested a review from a team as a code owner September 25, 2024 18:08
@rootulp rootulp requested review from rach-id and evan-forbes and removed request for a team September 25, 2024 18:08
evan-forbes
evan-forbes previously approved these changes Sep 25, 2024
View reviewed changes
rach-id
rach-id previously approved these changes Sep 25, 2024
View reviewed changes
Copy link
Member

@rach-id rach-id left a comment

Choose a reason for hiding this comment

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

+15 −10,259 🎉

@rootulp
Copy link
Collaborator Author

rootulp commented Sep 25, 2024

CI is failing :(

@rootulp
fix: checkout before using go.mod file
bffb8d3 
Also upgrade checkout to v4
@rootulp rootulp dismissed stale reviews from rach-id and evan-forbes via bffb8d3 September 25, 2024 19:41
cmwaters
cmwaters previously approved these changes Sep 25, 2024
View reviewed changes
Copy link
Contributor

@cmwaters cmwaters left a comment

Choose a reason for hiding this comment

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

I don't mind merging this because I don't think any of this is relevant but I'm curious, does this actually make it easier to fetch upstream changes?

@rootulp
Copy link
Collaborator Author

rootulp commented Sep 25, 2024

I think it should make it slightly easier b/c we won't have to resolve merge conflicts in these files.

@rootulp rootulp enabled auto-merge (squash) September 25, 2024 20:10
@rootulp rootulp disabled auto-merge September 30, 2024 14:14
rach-id
rach-id previously approved these changes Sep 30, 2024
View reviewed changes
@rootulp rootulp dismissed stale reviews from rach-id and cmwaters via 56d0aa4 October 3, 2024 19:39
@rootulp rootulp requested review from rach-id and cmwaters October 3, 2024 19:39
@rootulp rootulp enabled auto-merge (squash) October 3, 2024 19:39
rach-id
rach-id previously approved these changes Oct 11, 2024
View reviewed changes
cmwaters
cmwaters reviewed Oct 18, 2024
View reviewed changes
Copy link
Contributor

@cmwaters cmwaters left a comment

Choose a reason for hiding this comment

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

Happy to merge this but I think we should keep the celestia ADRs

@rootulp
Copy link
Collaborator Author

rootulp commented Oct 18, 2024

Great catch!

@rootulp rootulp marked this pull request as draft October 18, 2024 14:23
auto-merge was automatically disabled October 18, 2024 14:23

Pull request was converted to draft

@rootulp rootulp requested review from rach-id and cmwaters October 18, 2024 14:24
@rootulp rootulp marked this pull request as ready for review October 18, 2024 14:24
@rootulp rootulp enabled auto-merge (squash) October 21, 2024 12:43
@rootulp rootulp merged commit 746a1e1 into celestiaorg:v0.34.x-celestia Oct 21, 2024
13 checks passed
@rootulp rootulp deleted the rp/make-it-easier-to-pull-upstream branch October 21, 2024 13:08
rach-id pushed a commit that referenced this pull request 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
Reviewers

@cmwaters cmwaters cmwaters approved these changes

@evan-forbes evan-forbes evan-forbes approved these changes

@Magkoooh Magkoooh Magkoooh approved these changes

@staheri14 staheri14 Awaiting requested review from staheri14

@ninabarbakadze ninabarbakadze Awaiting requested review from ninabarbakadze

@rach-id rach-id Awaiting requested review from rach-id

Assignees

@rootulp rootulp

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Make it easier to pull upstream changes
5 participants
@rootulp @cmwaters @rach-id @evan-forbes @Magkoooh