Skip to content

Update build information #31

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

Merged
rftrdev merged 2 commits into from
Nov 23, 2022
Merged

Update build information #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86b5077
Update date format and add date to filename output
rftrdev Nov 23, 2022
96350c8
Remove build date and SVN version
rftrdev Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
run: echo "SHA_SHORT=$(git rev-parse --short ${{ github.sha }})" | Out-File -FilePath $env:GITHUB_ENV -Append

- name: Get date
run: echo "DATE=$(git log -1 --date=format:'%Y%b%d' --format=%cd)" | Out-File -FilePath $env:GITHUB_ENV -Append
run: echo "DATE=$(git log -1 --date=format:'%Y%m%d' --format=%cd)" | Out-File -FilePath $env:GITHUB_ENV -Append

- name: Check vars
run: |
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
run: msbuild ja2_VS2019.sln -property:Configuration=MapEditor

- name: Rename Map Editor output
run: mv bin/VS2013/MapEditor_EN_Release_master.exe ja2/ja2_mapeditor_113_${{ env.SHA_SHORT }}.exe
run: mv bin/VS2013/MapEditor_EN_Release_master.exe ja2/ja2_mapeditor_113_${{ env.DATE }}_${{ env.SHA_SHORT }}.exe

- name: Replace GameVersion.cpp (JA2)
run: |
Expand All @@ -64,7 +64,7 @@ jobs:
run: msbuild ja2_VS2019.sln -property:Configuration=Release

- name: Rename JA2 output
run: mv bin/VS2013/JA2_EN_Release_master_VS2019.exe ja2/ja2_113_${{ env.SHA_SHORT }}.exe
run: mv bin/VS2013/JA2_EN_Release_master_VS2019.exe ja2/ja2_113_${{ env.DATE }}_${{ env.SHA_SHORT }}.exe

- name: Replace GameVersion.cpp and builddefines.h (JA2 UB)
run: |
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
run: msbuild ja2_VS2019.sln -property:Configuration=Release

- name: Rename JA2 UB output
run: mv bin/VS2013/JA2_EN_Release_master_VS2019.exe ja2/ja2_ub_113_${{ env.SHA_SHORT }}.exe
run: mv bin/VS2013/JA2_EN_Release_master_VS2019.exe ja2/ja2_ub_113_${{ env.DATE }}_${{ env.SHA_SHORT }}.exe

- name: Upload output
uses: actions/upload-artifact@v3
Expand Down
4 changes: 2 additions & 2 deletions GameVersion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@

#endif

CHAR8 czVersionNumber[16] = { "Build 22.11.04" }; //YY.MM.DD
CHAR8 czVersionNumber[16] = { "Local build" };
CHAR16 zTrackingNumber[16] = { L"Z" };
CHAR16 zRevisionNumber[16] = { L"Revision 9405" };
CHAR16 zRevisionNumber[16] = { L"" };

// SAVE_GAME_VERSION is defined in header, change it there