Is git master tree the release version? Upgrading cacti via git

[Zermus]

So I'm going to start upgrading via git. Seems like the thing to do.

Not sure I want to keep updated on the dev release. Should I use master or 1.2.x?

Something like this?

Code: Select all

git clone https://github.com/cacti/cacti -b master /tmp/cacti_new
cp -R /tmp/cacti_new /var/www/html/cacti

[netniV]

So, the branches work in this way:

• Master - latest release
• 1.2.x - latest release + patches for next release
• Develop - development work for next major release (1.3)

If you use master, you will always get the latest current release. So that will be 1.2.15, 1.2.16, etc. up until 1.3 is released, and then you will get 1.3.0.

If you want to fine tune this more, you can update using tags, but then you have to do that more manually but you can stay on the 1.2.x branch even when master moves to 1.3.

Code: Select all

git checkout release/1.2.15

Personally, I don't copy the git release into it, I have git cloned into the folder I use so that I can simply update and not have to copy things around manually. This helps me for a number of reasons such as spotting things people manually modify but aren't in the committed version, performing semi-automatic updates, rolling back if necessary, etc.

[Zermus]

So you just clone straight into your /var/www/html/cacti or equivalent? That would be easier I suppose.