Atlassian uses cookies to improve your browsing experience, perform analytics and research, and conduct advertising. Accept all cookies to indicate that you agree to our use of cookies on your device. Atlassian cookies and tracking notice, (opens new window)
main branch doesn't contain tag for v2.2.0 after release of v2.2.0
General
Escalation
General
Escalation
Description
I understand v2.2.0 has been released via K8SPG-354 [I can't find it in the list of issues in Jira though, maybe it's a matter of permissions]
But the commit tagged as v2.2.0 is not part of the main branch, while the commit tagged as v2.1.0 is, as expected. Actually, I can't find any branch which contains v2.2.0.
Here is how I inspect the repository:
I am in the main branch:
$ git branch * main
Which points to 60a7b6eac: $ git rev-parse HEAD 60a7b6eac8369b1d15f908cdfc61b00c5c5fda50
Tag v2.2.0 is commit 21f8d7d89: $ git show v2.2.0|grep commit commit 21f8d7d89b9843fecb7e4bd828228bc4931e4e6d
But no branch contains this commit: $ git branch --contains 21f8d7d89
On the other hand, branch `main` contains v2.1.0, as expected: $ git branch --contains v2.1.0 * main
But the main branch doesn't seem right, because it doesn't contain the tag of the release.
I would expect commit 36ff6e6d6a236eb42d8260062bdb1cadd6b8b3b8 to be a merge commit and contain 21f8d7d89b9843fecb7e4bd828228bc4931e4e6d, similarly to the merge for v2.1.0: $ git show 81ffddc8ea942ec7093733efe2e28d41484ed0b9 commit 81ffddc8ea942ec7093733efe2e28d41484ed0b9 Merge: 71fe980f4 1e192bc63 Author: Viacheslav Sarzhan <slava.sarzhan@percona.com> Date: Thu May 4 21:48:46 2023 +0300
Merge pull request #434 from percona/release-2.1.0
K8SPG-352 pgo 2.1.0 release
Since the tags are not right, it's not possible to compute the right version numbers when rebuilding Docker images.
Environment
None
Activity
natalia.marukovich August 7, 2023 at 6:07 AM
We will fix this behaviour in the next releases.
natalia.marukovich July 31, 2023 at 11:56 AM
During our release process we create tag in release branch before merging to main, that is why it's expected that tag doesn't belong any branch. Except tag does not commit any branch, what kind of problem it creates for you?
natalia.marukovich July 28, 2023 at 12:42 PM
Ok, I will check it. Thanks for clarification.
Vangelis Koukis July 28, 2023 at 12:38 PM
Yes, I did try this, this is the point of this issue exactly.
Commit v2.2.0 is a commit is doesn't belong to any branch at all.
Since the main branch contains the commits for previous releases, is there any reason why it doesn't contain the commit for the latest v2.2.0 release? Right now, v2.2.0 is just a disjoint commit, outside any branch at all.
Vangelis Koukis July 28, 2023 at 12:36 PM
A bit more context, with actual commands:
$ IMG_ROOTLESS_BUILD=true IMGBUILDER=docker make postgres-operator-img-build
I understand v2.2.0 has been released via K8SPG-354 [I can't find it in the list of issues in Jira though, maybe it's a matter of permissions]
But the commit tagged as v2.2.0 is not part of the main branch, while the commit tagged as v2.1.0 is, as expected. Actually, I can't find any branch which contains v2.2.0.
Here is how I inspect the repository:
I am in the main branch:
$ git branch* mainWhich points to
60a7b6eac:$ git rev-parse HEAD60a7b6eac8369b1d15f908cdfc61b00c5c5fda50Tag v2.2.0 is commit
21f8d7d89:$ git show v2.2.0|grep commitcommit 21f8d7d89b9843fecb7e4bd828228bc4931e4e6dBut no branch contains this commit:
$ git branch --contains 21f8d7d89On the other hand, branch `main` contains v2.1.0, as expected:
$ git branch --contains v2.1.0* mainI understand this was the PR to release v2.2.0, which has been merged and closed:
https://github.com/percona/percona-postgresql-operator/pull/474
But the main branch doesn't seem right, because it doesn't contain the tag of the release.
I would expect commit
36ff6e6d6a236eb42d8260062bdb1cadd6b8b3b8to be a merge commit and contain
21f8d7d89b9843fecb7e4bd828228bc4931e4e6d,similarly to the merge for v2.1.0:
$ git show 81ffddc8ea942ec7093733efe2e28d41484ed0b9commit 81ffddc8ea942ec7093733efe2e28d41484ed0b9Merge: 71fe980f4 1e192bc63Author: Viacheslav Sarzhan <slava.sarzhan@percona.com>Date: Thu May 4 21:48:46 2023 +0300Merge pull request #434 from percona/release-2.1.0K8SPG-352 pgo 2.1.0 releaseSince the tags are not right, it's not possible to compute the right version numbers when rebuilding Docker images.