Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Short git hash #28

Merged
merged 16 commits into from
Oct 29, 2023
Merged

Short git hash #28

merged 16 commits into from
Oct 29, 2023

Conversation

taysta
Copy link
Owner

@taysta taysta commented Oct 28, 2023 •
edited

Razish and others added 9 commits September 30, 2023 16:15
@Razish
add short git hashes to engine and modules
2d792dc 
replace ~160 lines of cmake with a single call to git 🤷
@Razish
git error handling
7a903fc
@Razish
add git hash to console
0c5f500
@Razish
use consistent cvar name between SP and MP
14d3b21
@Razish
normalise references to versions everywhere. use git tag instead of j…
c1de4aa 
…ust the hash
@Razish
redefine stringizing macros for win32 resource scripts
b89e19e
@taysta
Merge remote-tracking branch 'OpenJK/add-short-git-hash' into short-hash
212154d 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	code/CMakeLists.txt
#	code/client/cl_console.cpp
#	code/game/g_local.h
#	code/game/g_main.cpp
#	code/qcommon/common.cpp
#	code/server/sv_ccmds.cpp
#	code/ui/ui_atoms.cpp
#	code/ui/ui_main.cpp
#	code/win32/game.rc
#	code/win32/winquake.rc
#	codeJK2/game/g_local.h
#	codeJK2/game/g_main.cpp
#	codeJK2/win32/game.rc
#	codemp/game/bg_public.h
#	codemp/game/g_local.h
#	codemp/qcommon/game_version.h
#	codemp/rd-rend2/game_version.h
@taysta
Remove EternalJK build timestamp
0df6987
@taysta
Merge branch 'master' into short-hash
2c8c15d
@taysta taysta marked this pull request as draft October 29, 2023 05:44
@taysta
Test adding fetch depth 0 fetch tags true to the action
9055018
@taysta
Bump checkout action runner version and remove fetch-depth
cc7fb21
@taysta
Test just using fetch-depth instead of fetch-tags, will probably end …
9dabbe4 
…up using both
@taysta
Try to get the head commit reference instead of merge commit for pull…
8d7d760 
…-requests
@taysta
Re-add fetch-depth 0 and fetch-tags true, need to figure out how to e…
82d7db2 
…lse here for not PR events so that the ref: part is only applied to PR's and not to other action triggering events
@taysta
Don't apply the ref: part that we use to get the merge commit of a PR…
58908b7 
… instead of the head commit when not in a pull request event
@taysta
Merge branch 'master' into short-hash
1b6fbf0 
# Conflicts:
#	codemp/game/g_cvar.c
#	codemp/game/g_main.c
#	codemp/game/g_xcvar.h
@taysta taysta marked this pull request as ready for review October 29, 2023 09:56
@taysta taysta merged commit b3779b9 into master Oct 29, 2023
15 checks passed
@taysta taysta deleted the short-hash branch October 29, 2023 09:56
@taysta taysta self-assigned this Oct 30, 2023
taysta pushed a commit that referenced this pull request Dec 11, 2023
@videoP
Merge pull request #28 from TrayHard/uncomment-chatlogs
7c29e7d 
Uncomment chatlogs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@taysta taysta

Labels
None yet
Projects
TaystJK Release
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@taysta @Razish