Switch sentry to commit hash for kicad nightly releases

This commit is contained in:
Marek Roszko 2022-08-15 20:57:44 -04:00
parent 96446cba1d
commit d33830e570
3 changed files with 15 additions and 1 deletions

View File

@ -67,6 +67,7 @@ set( _wvh_new_version_text
#ifndef __KICAD_VERSION_H__
#define __KICAD_VERSION_H__
#define KICAD_COMMIT_HASH \"${KICAD_COMMIT_HASH}\"
#define KICAD_VERSION_FULL \"${KICAD_VERSION_FULL}\"
#define KICAD_SEMANTIC_VERSION \"${KICAD_SEMANTIC_VERSION}\"
#define KICAD_MAJOR_VERSION \"${KICAD_MAJOR_VERSION}\"

View File

@ -51,6 +51,15 @@ macro( create_git_version_header _git_src_path )
RESULT_VARIABLE _git_log_result
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(
COMMAND
${GIT_EXECUTABLE} rev-parse HEAD
WORKING_DIRECTORY ${_git_src_path}
OUTPUT_VARIABLE _git_REV_PARSE_HEAD
ERROR_VARIABLE _git_log_error
RESULT_VARIABLE _git_log_result
OUTPUT_STRIP_TRAILING_WHITESPACE)
set( ENV{LC_ALL} ${_Git_SAVED_LC_ALL} )
endif( GIT_FOUND )
@ -60,6 +69,10 @@ macro( create_git_version_header _git_src_path )
set( KICAD_VERSION "(${_git_DESCRIBE})" )
endif()
if( _git_DESCRIBE )
set( KICAD_COMMIT_HASH "${_git_REV_PARSE_HEAD}" )
endif()
if( _git_REV_COUNT )
set( KICAD_GIT_REV "${_git_REV_COUNT}" )

View File

@ -315,7 +315,7 @@ void PGM_BASE::sentryInit()
#if !KICAD_IS_NIGHTLY
sentry_options_set_release( options, KICAD_SEMANTIC_VERSION );
#else
sentry_options_set_release( options, KICAD_MAJOR_MINOR_VERSION );
sentry_options_set_release( options, KICAD_COMMIT_HASH );
#endif
sentry_init( options );