From b148393c0948a3c945314e4e9cc16ba025abed6b Mon Sep 17 00:00:00 2001
From: OpenSauce04 <opensauce04@gmail.com>
Date: Thu, 7 Nov 2024 14:41:03 +0000
Subject: [PATCH] Fixed release version numbers not being displayed in-app

---
 .ci/android.sh                       |  4 +---
 .github/workflows/build.yml          |  2 +-
 CMakeModules/GenerateBuildInfo.cmake | 26 +++-----------------------
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/.ci/android.sh b/.ci/android.sh
index 3cfa902fe..b1c4faf40 100755
--- a/.ci/android.sh
+++ b/.ci/android.sh
@@ -1,9 +1,7 @@
 #!/bin/bash -ex
 
 export NDK_CCACHE=$(which ccache)
-[ "$GITHUB_REPOSITORY" = "citra-emu/citra-canary" ] &&
-   BUILD_FLAVOR=canary ||
-   BUILD_FLAVOR=nightly
+BUILD_FLAVOR=nightly
 
 if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
     export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0ac19bfb5..f938b53bd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -198,7 +198,7 @@ jobs:
             ${{ runner.os }}-android-
       - name: Set tag name
         run: |
-          if [[ "$GITHUB_REF_NAME" =~ ^canary- ]] || [[ "$GITHUB_REF_NAME" =~ ^nightly- ]]; then
+          if [[ "$GITHUB_REF_TYPE" == "tag" ]]; then
               echo "GIT_TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV
           fi
           echo $GIT_TAG_NAME
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()