search

ntop / n2n

Peer-to-peer VPN
GNU General Public License v3.0
6.19k stars 934 forks source link

Change when version.sh chooses a fallback vresion #896

Closed hamishcoleman closed 2 years ago

hamishcoleman commented 2 years ago

We aim to always build with the full version number from the git checkout, however if the current build is not being made from a git repository, we need to fallback to using the version number from the "VERSION" file.

This patch changes the choice of the fallback path from just assuming that any git repo is our git repo to explicitly looking for a .git dir in the top of our checkout.

Some integrated build systems end up doing a tar extract of the n2n source code inside their build-system git repo, and the old fallback check was failing in that case.

We still need to identify these build systems and work out a way to provide them with the full and correct version number for their build, but this patch should make things more reliable until then.

codecov-commenter commented 2 years ago

Codecov Report

Merging #896 (13880c4) into dev (c5f9e81) will not change coverage. The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##              dev     #896   +/-   ##
=======================================
  Coverage   18.30%   18.30%           
=======================================
  Files          41       41           
  Lines        8594     8594           
=======================================
  Hits         1573     1573           
  Misses       7021     7021

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update c5f9e81...13880c4. Read the comment docs.