Page 2 of 3
Re: Git describe shows 0.43.0 on master
Posted: 06 Aug 2018, 21:07
by psi29a
raevol wrote: ↑06 Aug 2018, 19:46
raevol@jabberwock:~/Development/openmw$ git push --tags
Did you read/try the last part of my post?
Re: Git describe shows 0.43.0 on master
Posted: 06 Aug 2018, 23:23
by raevol
psi29a wrote: ↑06 Aug 2018, 21:07
Did you read/try the last part of my post?
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
raevol@jabberwock:~/Development/openmw$ git checkout openmw-44
Switched to branch 'openmw-44'
Your branch is up to date with 'origin/openmw-44'.
raevol@jabberwock:~/Development/openmw$ git push --force origin openmw-44
Username for 'https://github.com': mickeylyle
Password for 'https://[email protected]':
Everything up-to-date
raevol@jabberwock:~/Development/openmw$
Re: Git describe shows 0.43.0 on master
Posted: 07 Aug 2018, 09:38
by Zini
Re: Git describe shows 0.43.0 on master
Posted: 07 Aug 2018, 10:12
by raevol
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.
Re: Git describe shows 0.43.0 on master
Posted: 07 Aug 2018, 10:35
by psi29a
Awesome! Now our PPA nightlies should work again, thanks raevol!
Re: Git describe shows 0.43.0 on master
Posted: 07 Aug 2018, 10:35
by raevol
psi29a wrote: ↑07 Aug 2018, 10:35
Awesome! Now our PPA nightlies should work again, thanks raevol!
Not sure if this is sarcasm...
Re: Git describe shows 0.43.0 on master
Posted: 07 Aug 2018, 11:13
by Atahualpa
raevol wrote: ↑07 Aug 2018, 10:35
psi29a wrote: ↑07 Aug 2018, 10:35
Awesome! Now our PPA nightlies should work again, thanks raevol!
Not sure if this is sarcasm...
Don't blame yourself, raevol. We all make mistakes, and as far as I can tell, the next release will solve that issue for good, right?
Re: Git describe shows 0.43.0 on master
Posted: 07 Aug 2018, 12:36
by psi29a
raevol wrote: ↑07 Aug 2018, 10:35
psi29a wrote: ↑07 Aug 2018, 10:35
Awesome! Now our PPA nightlies should work again, thanks raevol!
Not sure if this is sarcasm...
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
Posted: 07 Aug 2018, 12:52
by Zini
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
Posted: 07 Aug 2018, 18:59
by raevol
Atahualpa wrote: ↑07 Aug 2018, 11:13
Don't blame yourself, raevol. We all make mistakes, and as far as I can tell, the next release will solve that issue for good, right?
As long as I do the tag right next time.
psi29a wrote: ↑07 Aug 2018, 12:36
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.
Makes sense!
Zini wrote: ↑07 Aug 2018, 12:52
Shit happens. But releasing multiple binaries under the same version number is a bad idea.
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.