The-Homebrew-Cloud/azahar
2
0
Fork 0
mirror of https://github.com/azahar-emu/azahar.git synced 2025-03-04 09:45:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed release version numbers not being displayed in-app

Browse Source
This commit is contained in:
OpenSauce04 2024-11-07 14:41:03 +00:00
parent df791a8d37
commit b148393c09
3 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/android.sh
View File

@ -1,9 +1,7 @@
#!/bin/bash -ex #!/bin/bash -ex
export NDK_CCACHE=$(which ccache) export NDK_CCACHE=$(which ccache)
[ "$GITHUB_REPOSITORY" = "citra-emu/citra-canary" ] && BUILD_FLAVOR=nightly
BUILD_FLAVOR=canary ||
BUILD_FLAVOR=nightly
if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks" export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"

2
.github/workflows/build.yml vendored
View File

@ -198,7 +198,7 @@ jobs:
${{ runner.os }}-android- ${{ runner.os }}-android-
- name: Set tag name - name: Set tag name
run: | 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 echo "GIT_TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV
fi fi
echo $GIT_TAG_NAME echo $GIT_TAG_NAME

26
CMakeModules/GenerateBuildInfo.cmake
View File

@ -37,29 +37,9 @@ set(BUILD_VERSION "0")
set(BUILD_FULLNAME "${GIT_SHORT_REV}") set(BUILD_FULLNAME "${GIT_SHORT_REV}")
if (DEFINED ENV{CI}) if (DEFINED ENV{CI})
if (DEFINED ENV{GITHUB_ACTIONS}) if (DEFINED ENV{GITHUB_ACTIONS})
set(BUILD_REPOSITORY $ENV{GITHUB_REPOSITORY}) if ($ENV{GITHUB_REF_TYPE} STREQUAL "tag")
set(BUILD_TAG $ENV{GITHUB_REF_NAME}) set(BUILD_VERSION $ENV{GITHUB_REF_NAME})
endif() set(BUILD_FULLNAME "${BUILD_VERSION}")
# 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 "")
endif() endif()
endif() endif()
endif() endif()