From 304e64a0adf6436505d47fcd9d5889f8713c1a87 Mon Sep 17 00:00:00 2001 From: pips Date: Tue, 23 Sep 2025 19:50:06 +0200 Subject: [PATCH] fix(deb-package): use only date as package version --- .woodpecker/build.yaml | 2 -- Makefile | 3 +-- deb-package/DEBIAN/control | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 86bf83d..d57fe63 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -37,5 +37,3 @@ steps: environment: password: from_secret: package_token - commit_abbrev: ${CI_COMMIT_SHA:0:7} - diff --git a/Makefile b/Makefile index 98140fa..383a0a0 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,6 @@ dpkg: mkdir -p deb-package/usr/bin/ cp upstream/bin deb-package/usr/bin/ chmod -R o-w deb-package/ - sed -i "s|%date%|`date +%Y%m%d`|g" deb-package/DEBIAN/control - sed -i "s|%hash%|$(commit_abbrev)|g" deb-package/DEBIAN/control + sed -i "s|%date%|`date +%Y%m%d%H%M%S`|g" deb-package/DEBIAN/control dpkg-deb --build deb-package/ $(package) @curl --user CIBot:$(password) --upload-file $(package) $(CI_FORGE_URL)/api/packages/$(CI_REPO_OWNER)/debian/pool/noble/main/upload diff --git a/deb-package/DEBIAN/control b/deb-package/DEBIAN/control index 280352a..9c38df5 100644 --- a/deb-package/DEBIAN/control +++ b/deb-package/DEBIAN/control @@ -1,5 +1,5 @@ Package: mypackage-main -Version: 0.0.1~git%date%.%hash%-1 +Version: 0.0.1~git%date%-1 Section: base Priority: optional Architecture: amd64