-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Fix wrong base tag used for deployment and displayed in About dialog #4070
Conversation
By default, `git describe` shows the number of commits from the latest tag in the git history. In our case we don't want that, because this can cause problems: 2.4-alpha Expected: 2.4-alpha-N-abcdef123 main ---+X---------------+---> Actual: 2.3.0-M-abcdef456 \ / X------------X---> 2.3-beta 2.3.0 Hence, we need to add the `--first-parent` flag to git describe, so that it only follows the first parent of a merge and does not pull in tags from another branch. Fixes mixxxdj/website#248. See the issue for details: mixxxdj/website#248
f3f4b59
to
9d7b783
Compare
Note that this is based on the 2.3 branch and we might consider merging it into 2.3 instead of main to prevent being bitten by this when releasing 2.3.1 or something. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Works locally. Please verify, confirm, and merge.
I can confirm that this issue is fixed. However the branch is displayed wrong (HEAD) in the github builds. |
Do you like to fix it here or shall we track this as bug? |
If this introduces a regression in the stable branch, that should be fixed in the same PR. |
Is it actually a regression? We should check if this was also the case before this PR. |
I am pretty sure that this is not a regression. |
Yes, looks like this problem was present before: https://github.com/mixxxdj/mixxx/runs/3013968489#step:20:387 (build log from unrelated qml library PR) I think the missing branch name comes from github creating a merge commit without fetching branch names. But this should be taken care of in another PR. |
I have filed a bug: https://bugs.launchpad.net/mixxx/+bug/1934976 |
Thank you for the fix. |
By default,
git describe
shows the number of commits from the latesttag in the git history. In our case we don't want that, because this can
cause problems:
Hence, we need to add the
--first-parent
flag to git describe, so thatit only follows the first parent of a merge and does not pull in tags
from another branch.
Fixes mixxxdj/website#248.
See the issue for details: mixxxdj/website#248