From 86b5077ce94d1f298849efa3abb462af92bfed52 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Tue, 22 Nov 2022 23:24:28 -0800 Subject: [PATCH 1/2] Update date format and add date to filename output Date is now displayed numerically as YYYYMMDD --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63f691cae..7aeafe8bd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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: | @@ -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: | @@ -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: | @@ -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 From 96350c891e4876bc73fbbcf26dd8e05db3d8a9b6 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Tue, 22 Nov 2022 23:31:30 -0800 Subject: [PATCH 2/2] Remove build date and SVN version --- GameVersion.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index 7f4a6d8fa..0260d7b79 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -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