build.sh

@@ -9,27 +9,11 @@ cd $( dirname $0 )
 echo "Clean previous build..."
 rm -fr dist deb_dist
 
-if [ -n "$CI" -a $UID -eq 0 ]
-then
-	echo "CI environment detected, set current directory as git safe for root"
-	git config --global --add safe.directory $(pwd)
-fi
-
 echo "Detect version using git describe..."
 VERSION="$( git describe --tags|sed 's/^[^0-9]*//' )"
 
-echo "Computing python version..."
+echo "Set version=$VERSION in setup.py using sed..."
-if [ $( echo "$VERSION"|grep -c "-" ) -gt 0 ]
+sed -i "s/^version *=.*$/version = '$VERSION'/" setup.py
-then
-	echo "Development version detected ($VERSION), compute custom python dev version"
-	PY_VERSION="$( echo "$VERSION"|sed 's/-\([0-9]\)\+-.*$/.dev\1/' )"
-else
-	echo "Clean tagged version detected, use it"
-	PY_VERSION="$VERSION"
-fi
-
-echo "Set version=$PY_VERSION in setup.py using sed..."
-sed -i "s/^version *=.*$/version = '$PY_VERSION'/" setup.py
 
 if [ -d venv ]
 then
@@ -88,10 +72,6 @@ else
 	echo "Use debian codename from environment ($DEBIAN_CODENAME)"
 fi
 
-# Compute debian package version
-DEB_VERSION_SUFFIX="-1"
-DEB_VERSION="$VERSION$DEB_VERSION_SUFFIX"
-
 echo "Generate debian changelog using gitdch..."
 GITDCH_ARGS=('--verbose')
 [ -n "$QUIET_ARG" ] && GITDCH_ARGS=('--warning')
@@ -107,18 +87,11 @@ then
 fi
 $GITDCH \
 	--package-name mylib \
-	--version "${DEB_VERSION}" \
+	--version "${VERSION}" \
-	--version-suffix "${DEB_VERSION_SUFFIX}" \
 	--code-name $DEBIAN_CODENAME \
 	--output debian/changelog \
 	--release-notes ../../dist/release_notes.md \
 	--path ../../ \
-	--exclude "^CI: " \
-	--exclude "\.?woodpecker(\.yml)?" \
-	--exclude "build(\.sh)?" \
-	--exclude "tests(\.sh)?" \
-	--exclude "README(\.md)?" \
-	--exclude "^Merge branch " \
 	"${GITDCH_ARGS[@]}"
 
 echo "Add custom package name for dependencies..."