Feature: auto version for git achive and fix duplicates

manticoresoftware · Jan 23, 2025 · 73d5895 · 73d5895
1 parent 3a661d8
commit 73d5895
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 31 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+APP_VERSION export-subst
diff --git a/APP_VERSION b/APP_VERSION
@@ -1 +1 @@
-3.1.1
+$Format:%(describe:tags=true)$
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
 	"require": {
 		"manticoresoftware/telemetry": "^0.1.19",
 		"symfony/dependency-injection": "^6.1",
-		"manticoresoftware/buddy-core": "dev-main",
+		"manticoresoftware/buddy-core": "dev-feature/app-version-detection",
 		"php-ds/php-ds": "^1.4",
 		"manticoresoftware/manticoresearch-backup": "^1.3",
 		"symfony/expression-language": "^6.4"

diff --git a/composer.lock b/composer.lock
diff --git a/packages/rpm.spec b/packages/rpm.spec
@@ -39,7 +39,6 @@ rm -rf %{buildroot}
 %dir /usr/share/manticore/modules/{{ NAME }}/bin
 /usr/share/manticore/modules/{{ NAME }}/src/*
 /usr/share/manticore/modules/{{ NAME }}/vendor/*
-/usr/share/manticore/modules/{{ NAME }}/APP_VERSION
 /usr/share/manticore/modules/{{ NAME }}/composer.json
 /usr/share/manticore/modules/{{ NAME }}/composer.lock
 %attr(1755, root, root) /usr/share/manticore/modules/{{ NAME }}/bin/{{ NAME }}

diff --git a/src/Lib/Metric.php b/src/Lib/Metric.php
@@ -138,14 +138,7 @@ public function send(): bool {
 	 * @return array<string,string>
 	 */
 	public function getVersions(): array {
-		$buddyVersion = trim(
-			(string)file_get_contents(
-				__DIR__ . DIRECTORY_SEPARATOR . '..'
-				. DIRECTORY_SEPARATOR. '..'
-				. DIRECTORY_SEPARATOR . 'APP_VERSION'
-			)
-		);
-
+		$buddyVersion = Buddy::getVersion();
 		$statusMap = $this->getStatusMap();
 		if (!isset($statusMap['version'])) {
 			Buddy::debug('metric: failed to get version from SHOW STATUS query');

diff --git a/test/Buddy/src/Lib/CliArgsProcessorTest.php b/test/Buddy/src/Lib/CliArgsProcessorTest.php
@@ -10,6 +10,7 @@
  */
 
 use Manticoresearch\Buddy\Base\Lib\CliArgsProcessor;
+use Manticoresearch\Buddy\Core\Tool\Buddy;
 use Manticoresearch\BuddyTest\Trait\TestProtectedTrait;
 use PHPUnit\Framework\TestCase;
 
@@ -53,7 +54,7 @@ public function testVersionArgProcessOk(): void {
 		CliArgsProcessor::run();
 
 		echo "\nTesting the processing of the `version` argument\n";
-		$version = trim((string)file_get_contents(__DIR__ . '/../../../../APP_VERSION'));
+		$version = Buddy::getVersion();
 		$res = "Manticore Buddy v$version\n"
 			. "Copyright (c) 2024, Manticore Software LTD (https://manticoresearch.com)\n";
 		$this->assertEquals($res, self::invokeMethod(CliArgsProcessor::class, 'version'));