Wrong Salt version information from the master branch

[marbx]

Description

To build the Salt installer, version information is retrieved from git.

If git is checked out to a tag (e.g. v3000), there is no problem.

If git is checked out to master, the version information is unclear to me.

Building from master is necessary to test the installer for the next release.

salt/version.py uses this command:

git describe --tags --first-parent --match v[0-9]* --always

I think this was appropriate for the abandoned "develop" / multi releases git scheme.

Problem with the current "master" git scheme is that it returns from master

v3000_docs-33-g4249d7f1e1

This happens to be the last tag, but not the highest 3000.1.

Verified with

$ git tag --list | tail
v2019.2.2
v2019.2.2_docs
v2019.2.3
v2019.2.3_docs
v2019.8
v3000
v3000.0rc1
v3000.0rc2
v3000.1
v3000_docs

When I execute git describe, I get

v3000.1-206-g4249d7f1e1

which complies with documentation

Possibly related

• PR Ensure version.py included before we install #56418
• issue 3000.1 Windows Packages return saltversion 3000 #56415

Setup
Checkout master git repository. On a forked repository use

git pull upstream master && git fetch --tags upstream

Steps to Reproduce the behavior
Execute commands above.

Expected behavior
Containing 3000.1 and 206

[marbx]

As documented v3000.1-206-g4249d7f1e1 could be the basis for a correct Salt version from the Git master branch.

Updated the expected behavior

[marbx]

@sagetherage why did you restrict the scope to Windows?

[xeacott]

Putting @cmcmarrow on this too since he is actively working on some MSI related things. Although I have a PR out for something quite similar, there recently there was a moderate refactoring to version.py which made my PR obsolete.

[sagetherage]

@markuskramerIgitt

@ sagetherage why did you restrict the scope to Windows?

not limiting, more of a focus of who has the skill set - so more like a team tag, but Chad removed it in case that is confusing, my mistake!

[cmcmarrow]

I talked to @markuskramerIgitt on salt community. The problem was found and no fix needs to be push to salt.