From 1e7090a34d35a1fd318bb8a489f4adebe4a7bc4e Mon Sep 17 00:00:00 2001 From: lod Date: Sat, 22 Feb 2025 15:43:09 +0100 Subject: [PATCH] change version tag to version.revision.commit --- .SRCINFO | 2 +- PKGBUILD | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c45cbef..b3bb317 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = orca-slicer-git pkgdesc = G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.) - pkgver = 2.3.0.dev.4d762c4e91 + pkgver = 2.3.0.r24599.dc49116 pkgrel = 1 url = https://github.com/SoftFever/OrcaSlicer arch = x86_64 diff --git a/PKGBUILD b/PKGBUILD index ec536cd..f3bd0fd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=orca-slicer-git -pkgver=2.3.0.dev.4d762c4e91 +pkgver=2.3.0.r24599.dc49116 pkgrel=1 pkgdesc="G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)" arch=('x86_64') @@ -16,9 +16,9 @@ b2sums=('SKIP') pkgver() { cd $srcdir/$pkgname _version=$(sed -n 's/set(SoftFever_VERSION "\([^"]*\)-.*".*/\1/p' version.inc) - _suffix=$(sed -n 's/set(SoftFever_VERSION ".*-\([^"]*\)".*/\1/p' version.inc) - _commit=$(git rev-parse --short HEAD) - printf "%s.%s.%s" $_version $_suffix $_commit + _revision=$(git rev-list --count HEAD) + _commit=$(git rev-parse --short=7 HEAD) + printf "%s.r%s.%s" $_version $_revision $_commit } prepare() {