[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-kimageshop
Subject:    [sysadmin/binary-factory-tooling] custom-jobs/krita: Fix version string for Krita Windows nightly pa
From:       Dmitry Kazakov <null () kde ! org>
Date:       2020-09-18 19:53:55
Message-ID: 20200918195355.8D0161241547 () leptone ! kde ! org
[Download RAW message or body]

Git commit 8d1153a4b13df040832b725b035df6cd9c00a6f3 by Dmitry Kazakov.
Committed on 18/09/2020 at 11:29.
Pushed by bcooksley into branch 'master'.

Fix version string for Krita Windows nightly packages

The version tag should be taken from kritaversion.h file, in the
same way how AppImage stript does.

CC:kimageshop@kde.org

M  +1    -1    custom-jobs/krita/Krita_Nightly_Windows_Build.pipeline
M  +1    -1    custom-jobs/krita/Krita_Stable_Windows_Build.pipeline

https://invent.kde.org/sysadmin/binary-factory-tooling/commit/8d1153a4b13df040832b725b035df6cd9c00a6f3


diff --git a/custom-jobs/krita/Krita_Nightly_Windows_Build.pipeline \
b/custom-jobs/krita/Krita_Nightly_Windows_Build.pipeline index 7d865b7..4f3e35e \
                100644
--- a/custom-jobs/krita/Krita_Nightly_Windows_Build.pipeline
+++ b/custom-jobs/krita/Krita_Nightly_Windows_Build.pipeline
@@ -51,7 +51,7 @@ timestamps {
 				if errorlevel 1 exit /b %errorlevel%
 
 				pushd krita
-				for /f "tokens=* usebackq" %%a in (`git describe --dirty`) do (
+				for /f "tokens=3 delims=^  usebackq" %%a in (`findstr /C:"#define \
KRITA_VERSION_STRING" %WORKSPACE%\\build\\libs\\version\\kritaversion.h`) do (  set \
"PACKAGE_SUFFIX=%%a"  )
 				popd
diff --git a/custom-jobs/krita/Krita_Stable_Windows_Build.pipeline \
b/custom-jobs/krita/Krita_Stable_Windows_Build.pipeline index 4e5c39c..50b7c75 100644
--- a/custom-jobs/krita/Krita_Stable_Windows_Build.pipeline
+++ b/custom-jobs/krita/Krita_Stable_Windows_Build.pipeline
@@ -51,7 +51,7 @@ timestamps {
 				if errorlevel 1 exit /b %errorlevel%
 
 				pushd krita
-				for /f "tokens=* usebackq" %%a in (`git describe --dirty`) do (
+				for /f "tokens=3 delims=^  usebackq" %%a in (`findstr /C:"#define \
KRITA_VERSION_STRING" %WORKSPACE%\\build\\libs\\version\\kritaversion.h`) do (  set \
"PACKAGE_SUFFIX=%%a"  )
 				popd


[prev in list] [next in list] [prev in thread] [next in thread]