Merge tags in master branch

[sylr]

Hi,

It's really annoying to not have the tags (at least the major and minor ones) in the master branch.

@beorn7 recently did a pass on the prometheus project and merged all missing tags since v2.0.0 which were not in master.

I think the same should be done with Thanos.

Regards.

[bwplotka]

Why is annoying? I don't feel there is really need for that, so I would love to know the use case. (:

[sylr]

I do a lot of git log --oneline --graph and not having tags makes it hard to know where you at.

[beorn7]

Perhaps it is useful to know that having all the release labels in master is a side effect of the documented Prometheus branch management strategy rather than a (main) goal.

The strategy of merging bug fixes into the current release branch and then from there into master avoids the commit "duplication" you get with cherrypicking (i.e. commits that do the same thing but have different parents and therefore different commit hashes). If you use Git like you would use CVS/Subversion, it doesn't make a big difference. If you use Git as the distributed VCS it is, you get really annoyed if commits you have in some of your branches get rebased or cherrypicked. If you want to play nice, you avoid rebasing/cherrypicking of commits that are potentially used by others (which is certainly true for commits in master or in release branches).

[bwplotka]

Thanks!

I think that makes sense, but then we need to be more strict on the release bug fix process and document it in our release process. Will put that on @thanos-io/thanos-maintainers @thanos-io/thanos-triage agenda.(:

However @sylr there is no way to "merge old tags" right now, as we always used to cherry pick.

[sylr]

I believe you can:

s.rabot@wmbpro-srabot:~/go/src/github.com/thanos-io/thanos [master+tags]$ git reset --hard origin/master                                                                                                                       14:07:02
HEAD is now at 43f659a8 Fix invalid start/end params in series api (#2015)
s.rabot@wmbpro-srabot:~/go/src/github.com/thanos-io/thanos [master+tags]$ git merge --strategy=ours v0.9.0
Merge made by the 'ours' strategy.

s.rabot@wmbpro-srabot:~/go/src/github.com/thanos-io/thanos [master+tags]$ git merge --strategy=ours v0.10.0
Merge made by the 'ours' strategy.

s.rabot@wmbpro-srabot:~/go/src/github.com/thanos-io/thanos [master+tags]$ git graph
*   08149c6c (HEAD -> master+tags) Merge tag 'v0.10.0' into master+tags Sylvain Rabot 6 seconds ago
|\
| * 698c7a92 (tag: v0.10.0) *: update for 0.10.0 (#1989) Giedrius Statkevičius 11 days ago
| * c45e52d3 Release 0.10.0-rc.1 (#1981) Giedrius Statkevičius 2 weeks ago
| * bfd65e2d (tag: v0.10.0-rc.0) Cut release 0.10.0-rc.0 Giedrius Statkevičius 2 weeks ago
* |   b7dc64dd Merge tag 'v0.9.0' into master+tags Sylvain Rabot 15 seconds ago
|\ \
| * | 0833cad8 (tag: v0.9.0, origin/release-0.9) Cut release 0.9.0 (#1829) Bartlomiej Plotka 7 weeks ago
| * | b61c2a54 (tag: v0.9.0-rc.0) Fixed cross build and added cross build per PR on GH actions. (#1806) Bartlomiej Plotka 8 weeks ago
| * | 85164abd Cut release v0.9.0-rc.0 Bartek Plotka 8 weeks ago
* | | 43f659a8 (origin/master, origin/HEAD) Fix invalid start/end params in series api (#2015) Ben Ye 30 hours ago
* | | b1302218 Add env comment (#2023) Xiang Dai 2 days ago
* | | dbfe6f07 (master) Fix revert metric name regression (#2005) (#2019) Giedrius Statkevičius 3 days ago
* | | b1abfebf Clear up wording around 0d retention times (#2006) Ben Moskovitz 3 days ago
* | | 9fd5974d mixin/thanos: fix typo in alert name (#2017) Simon Pasquier 3 days ago
* | | 171889da Added binary index header implementation. (#1952) Bartlomiej Plotka 3 days ago
* | | 46a97fdc mixin: Add Thanos Ruler alerts (#1963) Kemal Akkoyun 9 days ago

[stale[bot]]

This issue/PR has been automatically marked as stale because it has not had recent activity. Please comment on status otherwise the issue will be closed in a week. Thank you for your contributions.

[bwplotka]

That is actually something we could try to add to our changelog. We already try to git merge (not squash) commits from release branches. 🤔

Thanks for proposing.

[bwplotka]

Funny enough we got hit by this a lot as v0.25.0.* tags are not on main e.g

cc @wiardvanrij

Sounds like what @sylr proposes is worth to make - essentially "fake" merge to have tags in main history... 🤔

[wiardvanrij]

I will test this on my own branch and see if we can make part of our release strategy.

[stale[bot]]

Hello 👋 Looks like there was no activity on this issue for the last two months. Do you mind updating us on the status? Is this still reproducible or needed? If yes, just comment on this PR or push a commit. Thanks! 🤗 If there will be no activity in the next two weeks, this issue will be closed (we can always reopen an issue if we need!). Alternatively, use remind command if you wish to be reminded at some point in future.