Master Repo Version out of Sync

[NOYB]

How do I get my master repo to upgrade to 18.7.a?  It's stuck on 18.1.b.

When I check for upgrade it shows new version opnsense-devel 18.7.a and upgrade to that as expected.  But if I do a make upgrade from the master repo it reverts to reporting version 18.1.b.

Don't think there would be any code difference.  Just version reporting and always thinking there is an upgrade available.

Firmware release type is set to development.

Thanks

[NOYB]

Think I may have figure it out.  Or at least go it to work.

I wasn't pushing the tags to the repo.

If there is other info techniques something I'm missing etc. I welcome your enlightenment.

Thanks

[franco]

Yes, pull automatically fetches tags, but push doesn't include tags by default.

You can add a separate origin to your /usr/core repository, e.g. "upstream" and then do "git fetch upstream" to slurp all tags asynchronously.


Cheers,
Franco

[NOYB]

Thanks for the confirmation.

My work flow is something like this.

Pull from github/opnsense/core into local repo on pc.
Apply my customizations.
Push to repo on opnsense machine /usr/core.  (need to include tags)
make upgrade

[franco]

Looks sensible. Use push --tags to the opnsense machine or a simple pull from the opnsense machine reversing the order. Both should render the tags on the opnsense machine.

I use the pull variant from a local repo because "make upgrade" needs to be run anyway. Mainly in conjunction with "git fetch && git reset --hard origin/branch_with_modifications" to always sync to the correct commit hash of the local repo instead of ending up with git merges / code clashes.


Cheers,
Franco