1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't push v1.13 tag but fake a v0. Normalized product label, especially removed prepended v to avoid confusion with git tags, also matches the main menu logo now. (#72)

Browse Source
This commit is contained in:
CptMoore
2023-01-11 21:58:21 -08:00
committed by GitHub
parent 56b4d16aea
commit 9f5b181299
3 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+4 -10
View File
@@ -96,20 +96,14 @@ jobs:
then then
# if we build for a specific tag, use that as the game version # if we build for a specific tag, use that as the game version
# examples: # examples:
# - v1.3.3 # - v1.13.1
# - v1.3.2-rc2 # - v1.13.2-rc2
GAME_VERSION="$GITHUB_REF_NAME" GAME_VERSION="$GITHUB_REF_NAME"
else else
# tag the very first commit as v1.13, fixes git describe if no tags are around # uses `git describe`, which tries to find a tag in the commit hierarchy. or fall back to a v1.13 version
if ! git rev-list v1.13 2>/dev/null
then
git tag v1.13 $(git rev-list --max-parents=0 HEAD) && git push origin v1.13
fi
# uses `git describe`, which tries to find a tag in the commit hierarchy
# example five (5) commits after v1.13: # example five (5) commits after v1.13:
# - v1.13-5-7g7ffa # - v1.13-5-7g7ffa
GAME_VERSION="$(git describe --tags --match='v[0-9]*' $GITHUB_SHA)" GAME_VERSION="$(git describe --tags --match='v[0-9]*' $GITHUB_SHA || echo v0-$(git rev-list --skip 1 --count $GITHUB_SHA)-g${GITHUB_SHA:0:8})"
fi fi
# max 15 CHAR8 # max 15 CHAR8
GAME_VERSION="${GAME_VERSION:0:15}" GAME_VERSION="${GAME_VERSION:0:15}"
.github/workflows/build_language.yml
+4 -3
View File
@@ -187,7 +187,8 @@ jobs:
set -eux set -eux
# "-" separates words, "_" combines words, see double-click behavior # "-" separates words, "_" combines words, see double-click behavior
DIST_NAME="JA2-${GAME_VERSION}-G${GAMEDIR_COMMIT_SHA:0:4}L${GAMEDIR_LANGUAGES_COMMIT_SHA:0:4}-${{ inputs.language }}" DIST_PREFIX='JA2_113'
DIST_NAME="${DIST_PREFIX}-${GAME_VERSION}-G${GAMEDIR_COMMIT_SHA:0:4}L${GAMEDIR_LANGUAGES_COMMIT_SHA:0:4}-${{ inputs.language }}"
echo "DIST_NAME=$DIST_NAME" >> $GITHUB_ENV echo "DIST_NAME=$DIST_NAME" >> $GITHUB_ENV
echo "If you encounter problems during gameplay, please provide the following version information: echo "If you encounter problems during gameplay, please provide the following version information:
@@ -204,8 +205,8 @@ jobs:
Gamedir Languages Repository: $GAMEDIR_LANGUAGES_REPOSITORY Gamedir Languages Repository: $GAMEDIR_LANGUAGES_REPOSITORY
Gamedir Languages Commit SHA: $GAMEDIR_LANGUAGES_COMMIT_SHA Gamedir Languages Commit SHA: $GAMEDIR_LANGUAGES_COMMIT_SHA
Gamedir Languages Commit Date: $GAMEDIR_LANGUAGES_COMMIT_DATETIME Gamedir Languages Commit Date: $GAMEDIR_LANGUAGES_COMMIT_DATETIME
" > gamedir/ja2_1.13_version.txt " > "gamedir/${DIST_PREFIX}-Version.txt"
cat gamedir/ja2_1.13_version.txt cat "gamedir/${DIST_PREFIX}-Version.txt"
- name: Create release archive - name: Create release archive
shell: bash shell: bash
GameVersion.cpp
+12 -24
View File
@@ -5,48 +5,36 @@
// Keeps track of the game version // Keeps track of the game version
// //
// ------------------------------ #ifdef JA2EDITOR // map editor
// MAP EDITOR (Release and Debug) BUILD VERSION
// ------------------------------
#ifdef JA2EDITOR
#ifdef JA2UB #ifdef JA2UB
CHAR16 zProductLabel[64] = { L"Unfinished Business - Map Editor v1.13" }; CHAR16 zProductLabel[64] = { L"JA2 1.13 Unfinished Business - Map Editor" };
#else #else
CHAR16 zProductLabel[64] = { L"Map Editor v1.13" }; CHAR16 zProductLabel[64] = { L"JA2 1.13 - Map Editor" };
#endif #endif
// ------------------------------ #elif defined JA2BETAVERSION // debug
// DEBUG BUILD VERSIONS
// ------------------------------
#elif defined JA2BETAVERSION
//DEBUG BUILD VERSION
#ifdef JA2UB #ifdef JA2UB
CHAR16 zProductLabel[64] = { L"Debug: Unfinished Business - v1.13" }; CHAR16 zProductLabel[64] = { L"Debug: JA2 1.13 Unfinished Business" };
#elif defined (JA113DEMO) #elif defined (JA113DEMO)
CHAR16 zProductLabel[64] = { L"Debug: JA2 Demo - v1.13" }; CHAR16 zProductLabel[64] = { L"Debug: JA2 1.13 Demo" };
#else #else
CHAR16 zProductLabel[64] = { L"Debug: v1.13" }; CHAR16 zProductLabel[64] = { L"Debug: JA2 1.13" };
#endif #endif
#elif defined CRIPPLED_VERSION #elif defined CRIPPLED_VERSION
//RELEASE BUILD VERSION s CHAR16 zProductLabel[64] = { L"JA2 113 Beta-0.98" };
CHAR16 zProductLabel[64] = { L"Beta v. 0.98" };
// ------------------------------ #else // release
// RELEASE BUILD VERSIONS
// ------------------------------
#else
//RELEASE BUILD VERSION
#ifdef JA2UB #ifdef JA2UB
CHAR16 zProductLabel[64] = { L"Unfinished Business - v1.13" }; CHAR16 zProductLabel[64] = { L"JA2 1.13 Unfinished Business" };
#elif defined (JA113DEMO) #elif defined (JA113DEMO)
CHAR16 zProductLabel[64] = { L"JA2 Demo - v1.13" }; CHAR16 zProductLabel[64] = { L"JA2 1.13 Demo" };
#else #else
CHAR16 zProductLabel[64] = { L"v1.13" }; CHAR16 zProductLabel[64] = { L"JA2 1.13" };
#endif #endif
#endif #endif