From 2ae1480edfc76f678abd26a06649e137b2cd83e7 Mon Sep 17 00:00:00 2001 From: OpenSauce04 Date: Tue, 2 Apr 2024 12:15:41 +0100 Subject: [PATCH] Fixed version numbers not being displayed in-app --- CMakeModules/GenerateBuildInfo.cmake | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/CMakeModules/GenerateBuildInfo.cmake b/CMakeModules/GenerateBuildInfo.cmake index 1c12e2919..740919d27 100644 --- a/CMakeModules/GenerateBuildInfo.cmake +++ b/CMakeModules/GenerateBuildInfo.cmake @@ -37,29 +37,9 @@ set(BUILD_VERSION "0") set(BUILD_FULLNAME "${GIT_SHORT_REV}") if (DEFINED ENV{CI}) if (DEFINED ENV{GITHUB_ACTIONS}) - set(BUILD_REPOSITORY $ENV{GITHUB_REPOSITORY}) - set(BUILD_TAG $ENV{GITHUB_REF_NAME}) - endif() - - # regex capture the string nightly or canary into CMAKE_MATCH_1 - string(REGEX MATCH "citra-emu/citra-?(.*)" OUTVAR ${BUILD_REPOSITORY}) - if ("${CMAKE_MATCH_COUNT}" GREATER 0) - # capitalize the first letter of each word in the repo name. - string(REPLACE "-" ";" REPO_NAME_LIST ${CMAKE_MATCH_1}) - foreach(WORD ${REPO_NAME_LIST}) - string(SUBSTRING ${WORD} 0 1 FIRST_LETTER) - string(SUBSTRING ${WORD} 1 -1 REMAINDER) - string(TOUPPER ${FIRST_LETTER} FIRST_LETTER) - set(REPO_NAME "${REPO_NAME}${FIRST_LETTER}${REMAINDER}") - endforeach() - string(REGEX MATCH "${CMAKE_MATCH_1}-([0-9]+)" OUTVAR ${BUILD_TAG}) - if (${CMAKE_MATCH_COUNT} GREATER 0) - set(BUILD_VERSION ${CMAKE_MATCH_1}) - endif() - if (BUILD_VERSION) - set(BUILD_FULLNAME "${REPO_NAME} ${BUILD_VERSION}") - else() - set(BUILD_FULLNAME "") + if ($ENV{GITHUB_REF_TYPE} STREQUAL "tag") + set(BUILD_VERSION $ENV{GITHUB_REF_NAME}) + set(BUILD_FULLNAME "${BUILD_VERSION}") endif() endif() endif()