allow elisa to be built from the stable 0.1 branch and default to it
ClosedPublic

Authored by mgallien on Apr 10 2018, 9:29 PM.

Details

Summary

allow elisa to be built from the stable 0.1 branch and default to it

Test Plan

0.1 branch is built by default
I also realized that I should really have used 0.1.0 for the release tag

Diff Detail

Repository
R877 Craft Blueprints for KDE
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
mgallien requested review of this revision.Apr 10 2018, 9:29 PM
mgallien created this revision.
kfunk accepted this revision.Apr 11 2018, 6:45 AM
This revision is now accepted and ready to land.Apr 11 2018, 6:45 AM
vonreth requested changes to this revision.Apr 11 2018, 8:05 AM
This revision now requires changes to proceed.Apr 11 2018, 8:05 AM
vonreth added inline comments.Apr 11 2018, 8:06 AM
extragear/elisa/version.ini
5

having a 0.1 branch and a 0.1 tarball will clash

vonreth added inline comments.Apr 11 2018, 8:09 AM
extragear/elisa/version.ini
5

I'd recommend to add the 0.1 tarball with the self.targets["0.1.0"].
For upcoming releases I would recommend a major.minior-patch version in the name, this would prevent the clash from the beginning

mgallien added inline comments.Apr 11 2018, 8:28 AM
extragear/elisa/version.ini
5

I fully agree with you. This is one more lesson learnt the hard way. I will update the diff.

mgallien updated this revision to Diff 31902.Apr 11 2018, 3:52 PM
  • define the tarbal as being 0.1.0 although the real archive is 0.1

define the 0.1 release tarbal as being 0.1.0 to avoid conflicting with the stable branch name

mgallien marked 3 inline comments as done.Apr 11 2018, 3:54 PM

Thanks for the review. I will not forget that the last .0 is there for a good reason.

vonreth added inline comments.Apr 11 2018, 5:38 PM
extragear/elisa/version.ini
5

Remove the tarball here and set the default target to 0.1.0 in the python file

mgallien updated this revision to Diff 31921.Apr 11 2018, 8:38 PM
  • default to 0.1.0 and fix build
mgallien marked an inline comment as done.Apr 11 2018, 8:39 PM

Default to 0.1.0 and ensure it builds with the tar

vonreth accepted this revision.Apr 11 2018, 8:44 PM

looks good

This revision is now accepted and ready to land.Apr 11 2018, 8:44 PM
This revision was automatically updated to reflect the committed changes.