Fixed version detection without git (#20951)

This commit is contained in:
Ilya Lavrenov authored and GitHub committed 2023-11-08 14:30:15 +01:00
1 parent fdaa4b5d03
commit 68e6484ecb
3 files changed
+20 -8

No files matched your search

+18 -6
View File
@@ -10,8 +10,11 @@ function(ov_branch_name VAR REPO_ROOT)
COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
WORKING_DIRECTORY ${REPO_ROOT}
OUTPUT_VARIABLE GIT_BRANCH
RESULT_VARIABLE EXIT_CODE
OUTPUT_STRIP_TRAILING_WHITESPACE)
set (${VAR} ${GIT_BRANCH} PARENT_SCOPE)
if(EXIT_CODE EQUAL 0)
set(${VAR} ${GIT_BRANCH} PARENT_SCOPE)
endif()
endif()
endfunction()
@@ -21,22 +24,31 @@ function(ov_commit_hash VAR REPO_ROOT)
COMMAND ${GIT_EXECUTABLE} rev-parse --short=11 HEAD
WORKING_DIRECTORY ${REPO_ROOT}
OUTPUT_VARIABLE GIT_COMMIT_HASH
RESULT_VARIABLE EXIT_CODE
OUTPUT_STRIP_TRAILING_WHITESPACE)
set (${VAR} ${GIT_COMMIT_HASH} PARENT_SCOPE)
if(EXIT_CODE EQUAL 0)
set(${VAR} ${GIT_COMMIT_HASH} PARENT_SCOPE)
endif()
endif()
endfunction()
function(ov_commit_number VAR REPO_ROOT)
set(GIT_COMMIT_NUMBER_FOUND OFF)
if(GIT_FOUND)
execute_process(
COMMAND ${GIT_EXECUTABLE} rev-list --count --first-parent HEAD
WORKING_DIRECTORY ${REPO_ROOT}
OUTPUT_VARIABLE GIT_COMMIT_NUMBER
RESULT_VARIABLE EXIT_CODE
OUTPUT_STRIP_TRAILING_WHITESPACE)
set (${VAR} ${GIT_COMMIT_NUMBER} PARENT_SCOPE)
else()
if(EXIT_CODE EQUAL 0)
set(GIT_COMMIT_NUMBER_FOUND ON)
set(${VAR} ${GIT_COMMIT_NUMBER} PARENT_SCOPE)
endif()
endif()
if(NOT GIT_COMMIT_NUMBER_FOUND)
# set zeros since git is not available
set (${VAR} "000" PARENT_SCOPE)
set(${VAR} "000" PARENT_SCOPE)
endif()
endfunction()
@@ -140,7 +152,7 @@ macro(ov_parse_ci_build_number repo_root)
ov_branch_name(GIT_BRANCH "${repo_root}")
ov_commit_hash(GIT_COMMIT_HASH "${repo_root}")
if(NOT GIT_BRANCH STREQUAL "master")
if(NOT GIT_BRANCH MATCHES "^(master|HEAD)$")
set(GIT_BRANCH_POSTFIX "-${GIT_BRANCH}")
endif()
+1 -1
View File
@@ -20,7 +20,7 @@
*/
#define OPENVINO_VERSION_MAJOR 2023
#define OPENVINO_VERSION_MINOR 2
#define OPENVINO_VERSION_MINOR 3
#define OPENVINO_VERSION_PATCH 0
namespace ov {
+1 -1
View File
@@ -31,7 +31,7 @@
*/
#define IE_VERSION_MAJOR 2023
#define IE_VERSION_MINOR 2
#define IE_VERSION_MINOR 3
#define IE_VERSION_PATCH 0
#include "ie_api.h"