search

pentix / qjournalctl

A multi-platform, Qt-based frontend for systemd's journalctl command. Accepting local as well as remote (SSH) data sources.
GNU General Public License v3.0
166 stars 17 forks source link

[Windows] Prefix/Squash commits #45

Closed pentix closed 4 years ago

pentix commented 4 years ago

Prefix/Squash all "fix CI" commits together to keep the commit history somewhat structured

alacasta commented 4 years ago

Hello @pentix

I don't know how to deal with this considering that the commits are already pushed up.

Can you please provide some hint on that?

pentix commented 4 years ago

If you allow I would squash some commits together (for example all CI trials) and add the Windows: prefix to your commits, prior to merging everything to the master branch. I'd do this only once the Windows Release is completed, and before merging everything, such that I don't mess up the git history right now 😅

alacasta commented 4 years ago

Yes, sounds not a problem !

Then, i assume you will handle them, right?

Apart from this... These commits were mainly for CI/CD using appveyor (it was my first time configuring it). Should we open an issue to effectivelly setup appveyor? I have mine ready, but i'd prefer to assciate to your account since you are the owner of the codebase. I can provide you some support when setting it up to avoid this "fix CI" commits btw :) In fact, it would be nice if we coul have automated the release process for both, linux and windows and also connect this with https://github.com/pentix/qjournalctl/issues/47 for a better versioning. If you agree

pentix commented 4 years ago

Ahh I should have seen this a few minutes earlier, I just deleted some old configuration from AppVeyor (Apparently I tried this when I wanted to setup Travis) and reinstantiated the project.

Yes, I will handle the commits as soon as the everything else is ready :)

pentix commented 4 years ago

Hi @alacasta

I went through all our commits and reworded/squashed some of them. All commit messages start with the prefix Windows: to signalize when they were introduced. Also, at some occasions, commits introduced some code only for the next commit to slightly modify (2017 -> 2019, add a trailing slash, etc.) the code again.

I squashed some of these commits into one commit, such that the commit history shows significant changes while still showing the progress it took to get there. :relieved:

alacasta commented 4 years ago

Hi @alacasta

I went through all our commits and reworded/squashed some of them. All commit messages start with the prefix Windows: to signalize when they were introduced. Also, at some occasions, commits introduced some code only for the next commit to slightly modify (2017 -> 2019, add a trailing slash, etc.) the code again.

I squashed some of these commits into one commit, such that the commit history shows significant changes while still showing the progress it took to get there. 😌

Thanks! I made many commits when tinkering around appveyor. Thanks for squashing them!