Skip to content

Portability and correctness fix of ci/version script

Jed Brown requested to merge jedbrown/gitlab-runner:jed/fix-ci-version into master

What does this MR do?

Fixes non-portable grep dependency and incorrect counting of commits since the most recent release.

Why was this MR needed?

grep -o is not supported by default grep on Open Indiana (#6585). One can use ggrep -o, but the solution in this commit is simpler.

The previous code started with git log --first-parent, which misses all full releases after v9.5.0 when run on master (because they are in the release branches, which are not first-parent ancestors of master). This commit finds the most recent tag (without insisting on --first-parent) and more efficiently counts the number of commits since that tag.

Are there points in the code the reviewer needs to double check?

Does this MR meet the acceptance criteria?

  • Documentation created/updated
  • Added tests for this feature/bug
  • In case of conflicts with master - branch was rebased

What are the relevant issue numbers?

#6585

Edited by Tomasz Maczukin

Merge request reports