Correctly set debian version of python packages

... as extra git commit count (was always 1)
ubi-agni · Oct 17, 2024 · 10081d3 · 10081d3
1 parent 4c3d2a6
commit 10081d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/good.repos b/.github/workflows/good.repos
@@ -3,6 +3,10 @@ repositories:
     type: git
     url: https://github.com/ubi-agni/catkin
     version: noetic-devel
+  catkin_tools:
+    type: git
+    url: https://github.com/catkin/catkin_tools
+    version: main
   genmsg:
     type: git
     url: https://github.com/ros/genmsg.git

diff --git a/src/build.sh b/src/build.sh
@@ -253,11 +253,12 @@ function build_python_pkg {
 
   # Get + Check release version
   version="$(get_python_release_version)" || return 5
+  local debian_version="${version#*-}"
   local deb_pkg_name; deb_pkg_name="python3-$(python3 setup.py --name)"
   pkg_exists "$deb_pkg_name" "$version" && return
 
   ici_label update_repo || return 1
-  ici_label "${SBUILD_QUIET[@]}" python3 setup.py --command-packages=stdeb.command bdist_deb || return 4
+  ici_label "${SBUILD_QUIET[@]}" python3 setup.py --command-packages=stdeb.command sdist_dsc --debian-version "$debian_version" bdist_deb || return 4
 
   gha_report_result "LATEST_PACKAGE" "$pkg_name"
   BUILT_PACKAGES+=("$deb_pkg_name: $version")