Did you read/try the last part of my post?
Git describe shows 0.43.0 on master
-
psi29a
- Posts: 4701
- Joined: 29 Sep 2011, 10:13
- Location: Belgium
- Gitlab profile: https://gitlab.com/psi29a/
- Contact:
Re: Git describe shows 0.43.0 on master
Re: Git describe shows 0.43.0 on master
I read it, and it didn't give me any information that I could act on. I've already said several times that I am a little lost here. Could someone explain to me exactly what I need to do?
Edit: just to reinforce what I am saying here:
Code: Select all
[email protected]:~/Development/openmw$ git checkout openmw-44
Switched to branch 'openmw-44'
Your branch is up to date with 'origin/openmw-44'.
[email protected]:~/Development/openmw$ git push --force origin openmw-44
Username for 'https://github.com': mickeylyle
Password for 'https://[email protected]':
Everything up-to-date
[email protected]:~/Development/openmw$
Re: Git describe shows 0.43.0 on master
Google is your friend: https://stackoverflow.com/questions/500 ... otated-tag
Re: Git describe shows 0.43.0 on master
Alright, several things. From Zini's info, I now know I used a lightweight tag instead of an annotated one. Fixed that.
I also named the tag the same as a branch, which is a big no-no. Fixed that, but had to "redo" the github release. I'm sure there's going to be people complaining that their build systems are broken as a result. So sorry, but I'm sure you'll get over it.
And lastly, from the documentation, git describe "finds the most recent tag that is reachable from a commit."
So the openmw-0.44.0 tag is not the "most recent tag" that is "reachable" from the commit master is on now. So that's why it's not showing up with git describe. As far as I can tell, that's perfectly fine.
I also named the tag the same as a branch, which is a big no-no. Fixed that, but had to "redo" the github release. I'm sure there's going to be people complaining that their build systems are broken as a result. So sorry, but I'm sure you'll get over it.
And lastly, from the documentation, git describe "finds the most recent tag that is reachable from a commit."
So the openmw-0.44.0 tag is not the "most recent tag" that is "reachable" from the commit master is on now. So that's why it's not showing up with git describe. As far as I can tell, that's perfectly fine.
-
psi29a
- Posts: 4701
- Joined: 29 Sep 2011, 10:13
- Location: Belgium
- Gitlab profile: https://gitlab.com/psi29a/
- Contact:
Re: Git describe shows 0.43.0 on master
Awesome! Now our PPA nightlies should work again, thanks raevol!
-
psi29a
- Posts: 4701
- Joined: 29 Sep 2011, 10:13
- Location: Belgium
- Gitlab profile: https://gitlab.com/psi29a/
- Contact:
Re: Git describe shows 0.43.0 on master
None at all, otherwise I would use my [/sarcasm] tag.
I just got home... so I'm catching up. Glad you got it figured out. Yes, our nightlies were stuck on 0.44 but using master to build.... during upload the uploads are rejected because 0.44 already exists.
Re: Git describe shows 0.43.0 on master
Shit happens. But releasing multiple binaries under the same version number is a bad idea. If we really want to fix this issue, we should do a 0.44.1. Personally, I think this is a bid pointless. 0.45.0 is around the corner anyway.
Re: Git describe shows 0.43.0 on master
As long as I do the tag right next time.
Makes sense!
The tag is still on the same commit. I'm not sure what you mean by binaries, but the release packages weren't even re-uploaded, I just used what is already there since it's the same exact code.