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

Commits on Sep 30, 2023

  1. add short git hashes to engine and modules 

    replace ~160 lines of cmake with a single call to git 🤷
    @Razish
    Razish committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    2d792dc View commit details
    Browse the repository at this point in the history

  2. git error handling

    @Razish
    Razish committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    7a903fc View commit details
    Browse the repository at this point in the history

  3. add git hash to console

    @Razish
    Razish committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    0c5f500 View commit details
    Browse the repository at this point in the history

  4. use consistent cvar name between SP and MP

    @Razish
    Razish committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    14d3b21 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. normalise references to versions everywhere. use git tag instead of j… 

    …ust the hash
    @Razish
    Razish committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    c1de4aa View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. redefine stringizing macros for win32 resource scripts

    @Razish
    Razish committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    b89e19e View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2023

  1. Merge remote-tracking branch 'OpenJK/add-short-git-hash' into short-hash 

    # 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
    taysta committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    212154d View commit details
    Browse the repository at this point in the history

  2. Remove EternalJK build timestamp

    @taysta
    taysta committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    0df6987 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into short-hash

    @taysta
    taysta committed Oct 28, 2023
    Configuration menu
    Copy the full SHA
    2c8c15d View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2023

  1. Test adding fetch depth 0 fetch tags true to the action

    @taysta
    taysta committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    9055018 View commit details
    Browse the repository at this point in the history

  2. Bump checkout action runner version and remove fetch-depth

    @taysta
    taysta committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    cc7fb21 View commit details
    Browse the repository at this point in the history

  3. Test just using fetch-depth instead of fetch-tags, will probably end … 

    …up using both
    @taysta
    taysta committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    9dabbe4 View commit details
    Browse the repository at this point in the history

  4. Try to get the head commit reference instead of merge commit for pull… 

    …-requests
    @taysta
    taysta committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    8d7d760 View commit details
    Browse the repository at this point in the history

  5. Re-add fetch-depth 0 and fetch-tags true, need to figure out how to e… 

    …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
    taysta committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    82d7db2 View commit details
    Browse the repository at this point in the history

  6. Don't apply the ref: part that we use to get the merge commit of a PR… 

    … instead of the head commit when not in a pull request event
    @taysta
    taysta committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    58908b7 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into short-hash 

    # Conflicts:
#	codemp/game/g_cvar.c
#	codemp/game/g_main.c
#	codemp/game/g_xcvar.h
    @taysta
    taysta committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    1b6fbf0 View commit details
    Browse the repository at this point in the history