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

Squashing dependency bump commits #79

Closed
aminya opened this issue Oct 6, 2020 · 9 comments
Closed

Squashing dependency bump commits #79

aminya opened this issue Oct 6, 2020 · 9 comments
Labels
dependencies Pull requests that update a dependency file

Comments

@aminya
Copy link
Member

aminya commented Oct 6, 2020

There are many numbers of commits on the master that just bump a "@types/" packages that make following the changes very hard. These have created a commit history bloat.

Can we get these squashed?

@UziTech
Copy link
Member

UziTech commented Oct 6, 2020

I think commit history bloat is a good tradeoff to be able to see when a specific dependency breaks something.

If we do something like bump_deps.yml we need to make sure tests don't have to be run manually and we can exclude certain updates if we need to because it breaks something.

@aminya
Copy link
Member Author

aminya commented Oct 6, 2020

For future updates, I am totally OK with adding a test step. However, I am also interested in squashing the commits that are already on the master branch.

I think the dependency upgrades should be tracked, but when all the updates are going to be landed on a single release that users check, there is no point in having separate commits.

Also, minor updates like @types/ packages are not going to affect the release, so squashing those will not have any effect.

If the commit history is cleaner, we can track the "actual code changes" better.

@UziTech
Copy link
Member

UziTech commented Oct 6, 2020

If the commit history is cleaner, we can track the "actual code changes" better

I think there are already better ways of tracking actual code changes than looking at commit history, but I am ok with squashing commits before this is released.

@UziTech
Copy link
Member

UziTech commented Oct 19, 2020

I was just given permission for atom-languageclient and would like to get v1.0.0 released today. Is there anything you would like to do to the code before that?

@aminya
Copy link
Member Author

aminya commented Oct 19, 2020

Great news! Can I squash the dependent bot commits?

We also need to rename the package back to atom-languageclient.

@UziTech
Copy link
Member

UziTech commented Oct 19, 2020

sounds good 👍

@aminya
Copy link
Member Author

aminya commented Oct 19, 2020

I renamed the repository. Could you make a PR renaming the package itself?

@UziTech
Copy link
Member

UziTech commented Oct 19, 2020

I created #88 to rename the package. After you squash the commits I'll publish v1.0.0

@aminya
Copy link
Member Author

aminya commented Oct 19, 2020

Squashing done! Closing this.

@aminya aminya closed this as completed Oct 19, 2020
@aminya aminya added the dependencies Pull requests that update a dependency file label Oct 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

No branches or pull requests

2 participants