commit 164414b1cbe2b73ed87aad2d3e0ec68ac7ed8df0
author Davide Pesavento <davidepesa@gmail.com> Mon Apr 22 23:14:03 2024 -0400
committer Davide Pesavento <davidepesa@gmail.com> Mon Apr 22 23:14:03 2024 -0400
tree 569c21ddb0f8c42eb931ab2c8b4cc4dcbc031b40
parent cc02c36fde03dac935c63e4bcbb4aed54f682f74

ci: python3-minimal is insufficient

Change-Id: I90359d05a7c997de7ef5b3aa4e4c445e095e632c

.jenkins.d/00-deps.sh

diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index 119f7b9..ff318f2 100755
--- a/.jenkins.d/00-deps.sh
+++ b/.jenkins.d/00-deps.sh
@@ -2,7 +2,8 @@
 set -eo pipefail
 
 APT_PKGS=(
-    build-essential
+    dpkg-dev
+    g++
     libboost-chrono-dev
     libboost-date-time-dev
     libboost-dev
@@ -16,7 +17,7 @@
     libsqlite3-dev
     libssl-dev
     pkg-config
-    python3-minimal
+    python3
 )
 FORMULAE=(boost openssl pkg-config)
 PIP_PKGS=()

wscript

diff --git a/wscript b/wscript
index 267b5e2..3abb155 100644
--- a/wscript
+++ b/wscript
@@ -111,10 +111,12 @@
         cmd = ['git', 'describe', '--abbrev=8', '--always', '--match', f'{GIT_TAG_PREFIX}*']
         version_from_git = subprocess.run(cmd, capture_output=True, check=True, text=True).stdout.strip()
         if version_from_git:
-            if version_from_git.startswith(GIT_TAG_PREFIX):
-                Context.g_module.VERSION = version_from_git.lstrip(GIT_TAG_PREFIX)
+            if GIT_TAG_PREFIX and version_from_git.startswith(GIT_TAG_PREFIX):
+                Context.g_module.VERSION = version_from_git[len(GIT_TAG_PREFIX):]
+            elif not GIT_TAG_PREFIX and ('.' in version_from_git or '-' in version_from_git):
+                Context.g_module.VERSION = version_from_git
             else:
-                # no tags matched
+                # no tags matched (or we are in a shallow clone)
                 Context.g_module.VERSION = f'{VERSION_BASE}+git.{version_from_git}'
     except (OSError, subprocess.SubprocessError):
         pass