From 46ca482930109c206523e306d4902018756f3a56 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 01:07:12 -0800 Subject: [PATCH 01/32] Create manual-build.yml --- .github/workflows/manual-build.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/workflows/manual-build.yml diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml new file mode 100644 index 000000000..f119ac0ac --- /dev/null +++ b/.github/workflows/manual-build.yml @@ -0,0 +1,13 @@ +name: manual build + +on: + workflow_dispatch: + +jobs: + build: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v3 + - name: make + run: make From b522d14d3bae7bb3de3f45f7b82b1c62f0ba3a4a Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 01:25:02 -0800 Subject: [PATCH 02/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index f119ac0ac..2bc9f2aa9 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -9,5 +9,6 @@ jobs: steps: - uses: actions/checkout@v3 - - name: make - run: make + - uses: ilammy/msvc-dev-cmd@v1.4.1 + - name: compile + run: build From 2c847fadb7e8e1193fe812bcdd99b5fc99dbc8dc Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 01:38:48 -0800 Subject: [PATCH 03/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 2bc9f2aa9..055b284bd 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -11,4 +11,4 @@ jobs: - uses: actions/checkout@v3 - uses: ilammy/msvc-dev-cmd@v1.4.1 - name: compile - run: build + run: cl main.cpp From 38799e7e96db0052f9ce0520af89cd473b7a9e51 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 01:50:22 -0800 Subject: [PATCH 04/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 055b284bd..adc9d07b6 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -11,4 +11,4 @@ jobs: - uses: actions/checkout@v3 - uses: ilammy/msvc-dev-cmd@v1.4.1 - name: compile - run: cl main.cpp + run: cl ext/export/src/main.cpp From c602ddb706f5263477bb93992798a5afb24b90ed Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 10:10:17 -0800 Subject: [PATCH 05/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index adc9d07b6..527e0d3f5 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -11,4 +11,4 @@ jobs: - uses: actions/checkout@v3 - uses: ilammy/msvc-dev-cmd@v1.4.1 - name: compile - run: cl ext/export/src/main.cpp + run: cl ja2_VS2019.sln From 01af7feb3ebc5f5f90af92afb1ee63dd47b8d628 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 12:01:16 -0800 Subject: [PATCH 06/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 527e0d3f5..8754f7eea 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -9,6 +9,5 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: ilammy/msvc-dev-cmd@v1.4.1 - - name: compile - run: cl ja2_VS2019.sln + - uses: microsoft/setup-msbuild@v1.1 + - run: msbuild ja2_VS2019.sln -property:Configuration=Release From 532b8a898c2cc21a4a8c3d9bc3e05d8e6cced3cf Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 13:20:12 -0800 Subject: [PATCH 07/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 8754f7eea..ed8bb3cef 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -10,4 +10,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: microsoft/setup-msbuild@v1.1 - - run: msbuild ja2_VS2019.sln -property:Configuration=Release + - run: msbuild ja2_VS2019.sln -property:Configuration=Release;OutputPath=./;OutputType=Exe + + From 997866ce5c9ee1f57bda81ed0026c5b3e6968cb2 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 13:34:28 -0800 Subject: [PATCH 08/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index ed8bb3cef..c2fcd281f 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: microsoft/setup-msbuild@v1.1 - - run: msbuild ja2_VS2019.sln -property:Configuration=Release;OutputPath=./;OutputType=Exe + - run: msbuild ja2_VS2019.sln -property:Configuration=Release;OutputPath=../;OutputType=Exe From 0caa855f1e8e9d61a811d3339503f7fcd2e9919a Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 15:14:15 -0800 Subject: [PATCH 09/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index c2fcd281f..501757ac0 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -10,6 +10,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: microsoft/setup-msbuild@v1.1 - - run: msbuild ja2_VS2019.sln -property:Configuration=Release;OutputPath=../;OutputType=Exe + - run: msbuild ja2_VS2019.sln -property:Configuration=Release -p:OutputType=Exe From 4e2a5d4509365c9cd0d50b0dbcd99214471cbd44 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 17:32:01 -0800 Subject: [PATCH 10/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 501757ac0..9aaf985c4 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -11,5 +11,7 @@ jobs: - uses: actions/checkout@v3 - uses: microsoft/setup-msbuild@v1.1 - run: msbuild ja2_VS2019.sln -property:Configuration=Release -p:OutputType=Exe - + - uses: actions/cache@v3.0.11 + with: + path: bin/VS2013/JA2_EN_Release_master_VS2019.exe From c844c7f1fb7cb5a0b503bcdf0721dd3330c05362 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 18:21:14 -0800 Subject: [PATCH 11/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 9aaf985c4..be756e58b 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -14,4 +14,5 @@ jobs: - uses: actions/cache@v3.0.11 with: path: bin/VS2013/JA2_EN_Release_master_VS2019.exe + key: ja2-113 From 4f17b629310a947ca80bf01d3760820a123d3d8b Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 19:58:51 -0800 Subject: [PATCH 12/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index be756e58b..f70cdb363 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -10,9 +10,20 @@ jobs: steps: - uses: actions/checkout@v3 - uses: microsoft/setup-msbuild@v1.1 - - run: msbuild ja2_VS2019.sln -property:Configuration=Release -p:OutputType=Exe - - uses: actions/cache@v3.0.11 + + - name: Build + run: msbuild ja2_VS2019.sln -property:Configuration=Release + + - name: Rename output + run: mv bin/VS2013/JA2_EN_Release_master_VS2019.exe ja2_113.exe + + - name: Upload executable + uses: actions/upload-artifact@v3 with: - path: bin/VS2013/JA2_EN_Release_master_VS2019.exe - key: ja2-113 - + name: ja2_113 + path: ja2_113.exe + + - name: Download executable + uses: actions/download-artifact@v3 + with: + name: ja2_113 From 0599d14a7c552ebd8c296ff7c5210eb88416e4af Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 20:28:34 -0800 Subject: [PATCH 13/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index f70cdb363..0380b02ba 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -11,19 +11,20 @@ jobs: - uses: actions/checkout@v3 - uses: microsoft/setup-msbuild@v1.1 + - name: Get commit hash + id: vars + run: echo "hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + - name: Build run: msbuild ja2_VS2019.sln -property:Configuration=Release - name: Rename output - run: mv bin/VS2013/JA2_EN_Release_master_VS2019.exe ja2_113.exe + run: mv bin/VS2013/JA2_EN_Release_master_VS2019.exe ja2_113_${{steps.vars.output.hash}}.exe - name: Upload executable uses: actions/upload-artifact@v3 with: name: ja2_113 - path: ja2_113.exe + path: ja2_113_${{steps.vars.output.hash}}.exe - - name: Download executable - uses: actions/download-artifact@v3 - with: - name: ja2_113 + From 82924fd33ec002d2902155269b4dae8511105f50 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 21:31:13 -0800 Subject: [PATCH 14/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 0380b02ba..c3fdc0b41 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -11,20 +11,16 @@ jobs: - uses: actions/checkout@v3 - uses: microsoft/setup-msbuild@v1.1 - - name: Get commit hash - id: vars - run: echo "hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - - name: Build run: msbuild ja2_VS2019.sln -property:Configuration=Release - name: Rename output - run: mv bin/VS2013/JA2_EN_Release_master_VS2019.exe ja2_113_${{steps.vars.output.hash}}.exe + run: mv bin/VS2013/JA2_EN_Release_master_VS2019.exe ja2_113_${{ github.sha }}.exe - name: Upload executable uses: actions/upload-artifact@v3 with: name: ja2_113 - path: ja2_113_${{steps.vars.output.hash}}.exe + path: ja2_113_${{ github.sha }}.exe From f4593b39bdb52d800ea9b27432ad827bc490d8c5 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 22:02:08 -0800 Subject: [PATCH 15/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index c3fdc0b41..c8ea4b959 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -11,6 +11,13 @@ jobs: - uses: actions/checkout@v3 - uses: microsoft/setup-msbuild@v1.1 + - name: Shorten SHA + id: vars + run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + + - name: Check outputs + run: echo ${{ steps.vars.outputs.sha_short }} + - name: Build run: msbuild ja2_VS2019.sln -property:Configuration=Release From 329ba929838c0e2f992cc43d271c3e2bdd1cd2f7 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 22:09:43 -0800 Subject: [PATCH 16/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index c8ea4b959..2cd078252 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -16,7 +16,7 @@ jobs: run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - name: Check outputs - run: echo ${{ steps.vars.outputs.sha_short }} + run: echo "${{ steps.vars.outputs.sha_short }}" - name: Build run: msbuild ja2_VS2019.sln -property:Configuration=Release From dc7fa7fd617f9c52018c8957a798953190a96bd1 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 22:21:34 -0800 Subject: [PATCH 17/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 2cd078252..908784178 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -13,7 +13,7 @@ jobs: - name: Shorten SHA id: vars - run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})" - name: Check outputs run: echo "${{ steps.vars.outputs.sha_short }}" From 946bc3fe85e68ca0f8780ab8aaa0d6aa720ab481 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 22:24:13 -0800 Subject: [PATCH 18/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 908784178..d782d11e8 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -13,7 +13,8 @@ jobs: - name: Shorten SHA id: vars - run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})" + # run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})" + run: echo "sha_short=$(git rev-parse --short ${{ github.sha }})" - name: Check outputs run: echo "${{ steps.vars.outputs.sha_short }}" From 00f7fdd0fc3eda2894d780d7fdea5784423ff380 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 22:25:58 -0800 Subject: [PATCH 19/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index d782d11e8..fb5ab53ea 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -13,8 +13,7 @@ jobs: - name: Shorten SHA id: vars - # run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})" - run: echo "sha_short=$(git rev-parse --short ${{ github.sha }})" + run: echo "sha_short=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT - name: Check outputs run: echo "${{ steps.vars.outputs.sha_short }}" From b97d19ca4becb241378eb9fbfbf6cb63948520a9 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 22:30:09 -0800 Subject: [PATCH 20/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index fb5ab53ea..ee902f886 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -13,21 +13,21 @@ jobs: - name: Shorten SHA id: vars - run: echo "sha_short=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT + run: echo "SHA_SHORT=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV - name: Check outputs - run: echo "${{ steps.vars.outputs.sha_short }}" + run: echo "${{ env.SHA_SHORT }}" - name: Build run: msbuild ja2_VS2019.sln -property:Configuration=Release - name: Rename output - run: mv bin/VS2013/JA2_EN_Release_master_VS2019.exe ja2_113_${{ github.sha }}.exe + run: mv bin/VS2013/JA2_EN_Release_master_VS2019.exe ja2_113_${{ env.SHA_SHORT }}.exe - name: Upload executable uses: actions/upload-artifact@v3 with: name: ja2_113 - path: ja2_113_${{ github.sha }}.exe + path: ja2_113_${{ env.SHA_SHORT }}.exe From 7d0765d9a028dd03a8dcd9ae930da4be1bd86ce1 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 22:49:53 -0800 Subject: [PATCH 21/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index ee902f886..6d13360e4 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -13,7 +13,7 @@ jobs: - name: Shorten SHA id: vars - run: echo "SHA_SHORT=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV + run: echo "SHA_SHORT=$(git rev-parse --short ${{ github.sha }})" | Out-File -FilePath $env:GITHUB_ENV -Append - name: Check outputs run: echo "${{ env.SHA_SHORT }}" From 0d937e4e003d5e6a35189ba8fb73199a8fe6ca0c Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 22:56:27 -0800 Subject: [PATCH 22/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 6d13360e4..838960050 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -12,11 +12,15 @@ jobs: - uses: microsoft/setup-msbuild@v1.1 - name: Shorten SHA - id: vars run: echo "SHA_SHORT=$(git rev-parse --short ${{ github.sha }})" | Out-File -FilePath $env:GITHUB_ENV -Append - - name: Check outputs - run: echo "${{ env.SHA_SHORT }}" + - name: Get date + run: echo "DATE=$(Get-Date -Format yyyy.MM.dd)" | Out-File -FilePath $env:GITHUB_ENV -Append + + - name: Check vars + run: | + echo "${{ env.SHA_SHORT }}" + echo "${{ env.DATE }}" - name: Build run: msbuild ja2_VS2019.sln -property:Configuration=Release From 07637fb67a731920be4dba09b15ca9bbccf108ab Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 23:41:49 -0800 Subject: [PATCH 23/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 838960050..a453f26df 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -21,6 +21,19 @@ jobs: run: | echo "${{ env.SHA_SHORT }}" echo "${{ env.DATE }}" + + - name: Replace GameVersion.cpp + run: | + rm GameVersion.cpp + echo @" + #include "Types.h" + #include "GameVersion.h" + + CHAR16 zVersionLabel[256] = { L"Release v1.13 (Development Build) (Github)" }; + CHAR8 czVersionNumber[16] = { L"Build ${{ env.DATE }}" }; + CHAR16 zTrackingNumber[16] = { L"Z" }; + CHAR16 zRevisionNumber[16] = { L"Hash ${{ env.SHA_SHORT }}" }; + "@ | Out-File -FilePath GameVersion.cpp - name: Build run: msbuild ja2_VS2019.sln -property:Configuration=Release From 09263b669f5859345c0017172fa26109369dcc01 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 23:58:00 -0800 Subject: [PATCH 24/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index a453f26df..dba2fa446 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -30,7 +30,7 @@ jobs: #include "GameVersion.h" CHAR16 zVersionLabel[256] = { L"Release v1.13 (Development Build) (Github)" }; - CHAR8 czVersionNumber[16] = { L"Build ${{ env.DATE }}" }; + CHAR8 czVersionNumber[16] = { "Build ${{ env.DATE }}" }; CHAR16 zTrackingNumber[16] = { L"Z" }; CHAR16 zRevisionNumber[16] = { L"Hash ${{ env.SHA_SHORT }}" }; "@ | Out-File -FilePath GameVersion.cpp From 45c49802515a202df59d98147129e7b7217f3d24 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Tue, 8 Nov 2022 00:13:20 -0800 Subject: [PATCH 25/32] Update manual-build.yml --- .github/workflows/manual-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index dba2fa446..9c2417867 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -30,7 +30,7 @@ jobs: #include "GameVersion.h" CHAR16 zVersionLabel[256] = { L"Release v1.13 (Development Build) (Github)" }; - CHAR8 czVersionNumber[16] = { "Build ${{ env.DATE }}" }; + CHAR8 czVersionNumber[16] = { "V ${{ env.DATE }}" }; CHAR16 zTrackingNumber[16] = { L"Z" }; CHAR16 zRevisionNumber[16] = { L"Hash ${{ env.SHA_SHORT }}" }; "@ | Out-File -FilePath GameVersion.cpp From 0927354e8193cecaa1bcb810ce888a4b18e2f4ca Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Mon, 7 Nov 2022 01:07:12 -0800 Subject: [PATCH 26/32] Create manual-build.yml --- .github/workflows/manual-build.yml | 50 ++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .github/workflows/manual-build.yml diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml new file mode 100644 index 000000000..9c2417867 --- /dev/null +++ b/.github/workflows/manual-build.yml @@ -0,0 +1,50 @@ +name: manual build + +on: + workflow_dispatch: + +jobs: + build: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v3 + - uses: microsoft/setup-msbuild@v1.1 + + - name: Shorten SHA + run: echo "SHA_SHORT=$(git rev-parse --short ${{ github.sha }})" | Out-File -FilePath $env:GITHUB_ENV -Append + + - name: Get date + run: echo "DATE=$(Get-Date -Format yyyy.MM.dd)" | Out-File -FilePath $env:GITHUB_ENV -Append + + - name: Check vars + run: | + echo "${{ env.SHA_SHORT }}" + echo "${{ env.DATE }}" + + - name: Replace GameVersion.cpp + run: | + rm GameVersion.cpp + echo @" + #include "Types.h" + #include "GameVersion.h" + + CHAR16 zVersionLabel[256] = { L"Release v1.13 (Development Build) (Github)" }; + CHAR8 czVersionNumber[16] = { "V ${{ env.DATE }}" }; + CHAR16 zTrackingNumber[16] = { L"Z" }; + CHAR16 zRevisionNumber[16] = { L"Hash ${{ env.SHA_SHORT }}" }; + "@ | Out-File -FilePath GameVersion.cpp + + - name: Build + run: msbuild ja2_VS2019.sln -property:Configuration=Release + + - name: Rename output + run: mv bin/VS2013/JA2_EN_Release_master_VS2019.exe ja2_113_${{ env.SHA_SHORT }}.exe + + - name: Upload executable + uses: actions/upload-artifact@v3 + with: + name: ja2_113 + path: ja2_113_${{ env.SHA_SHORT }}.exe + + From 9f7a34d0568750fea9cad809f1947e0c724495a2 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Tue, 8 Nov 2022 23:43:45 -0800 Subject: [PATCH 27/32] Build actions (#2) --- .github/workflows/manual-build.yml | 74 +++++++++++++++++++++++++++--- .github/workflows/test-action.yml | 27 +++++++++++ 2 files changed, 94 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/test-action.yml diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml index 9c2417867..67edef0c3 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build.yml @@ -21,8 +21,33 @@ jobs: run: | echo "${{ env.SHA_SHORT }}" echo "${{ env.DATE }}" + + - name: Checkout gamedir + uses: actions/checkout@v3 + with: + repository: 1dot13/gamedir + path: ja2 + + - name: Replace GameVersion.cpp (Map Editor) + run: | + rm GameVersion.cpp + echo @" + #include "Types.h" + #include "GameVersion.h" - - name: Replace GameVersion.cpp + CHAR16 zVersionLabel[256] = { L"Map Editor v1.13 (Development Build) (Github)" }; + CHAR8 czVersionNumber[16] = { "V ${{ env.DATE }}" }; + CHAR16 zTrackingNumber[16] = { L"Z" }; + CHAR16 zRevisionNumber[16] = { L"Hash ${{ env.SHA_SHORT }}" }; + "@ | Out-File -FilePath GameVersion.cpp + + - name: Build Map Editor + run: msbuild ja2_VS2019.sln -property:Configuration=MapEditor + + - name: Rename Map Editor output + run: mv bin/VS2013/MapEditor_EN_Release_master.exe ja2/mapeditor_113_${{ env.SHA_SHORT }}.exe + + - name: Replace GameVersion.cpp (JA2) run: | rm GameVersion.cpp echo @" @@ -35,16 +60,51 @@ jobs: CHAR16 zRevisionNumber[16] = { L"Hash ${{ env.SHA_SHORT }}" }; "@ | Out-File -FilePath GameVersion.cpp - - name: Build + - name: Build JA2 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 + + - name: Replace GameVersion.cpp and builddefines.h (JA2 UB) + run: | + rm GameVersion.cpp + echo @" + #include "Types.h" + #include "GameVersion.h" + + CHAR16 zVersionLabel[256] = { L"Release Unfinished Business v1.13 (Development Build) (Github)" }; + CHAR8 czVersionNumber[16] = { "V ${{ env.DATE }}" }; + CHAR16 zTrackingNumber[16] = { L"Z" }; + CHAR16 zRevisionNumber[16] = { L"Hash ${{ env.SHA_SHORT }}" }; + "@ | Out-File -FilePath GameVersion.cpp + + rm builddefines.h + echo @" + #ifndef _BUILDDEFINES_H_ + #define _BUILDDEFINES_H_ + #include "Language Defines.h" + #define JA2UB + #define JA2UBMAPS + #define FORCE_ASSERTS_ON + #define _CRT_SECURE_NO_WARNINGS + #define _CRT_NON_CONFORMING_SWPRINTFS + #define _SCL_SECURE_NO_WARNINGS + #include "Profiler.h" + #endif + "@ | Out-File -FilePath builddefines.h - - name: Rename output - run: mv bin/VS2013/JA2_EN_Release_master_VS2019.exe ja2_113_${{ env.SHA_SHORT }}.exe - + - name: Build JA2 UB + 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 + - name: Upload executable uses: actions/upload-artifact@v3 with: name: ja2_113 - path: ja2_113_${{ env.SHA_SHORT }}.exe + path: | + ja2/ + !ja2/.git/ - diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml new file mode 100644 index 000000000..9b9d9149f --- /dev/null +++ b/.github/workflows/test-action.yml @@ -0,0 +1,27 @@ +name: test-action + +on: + workflow_dispatch: + +jobs: + build: + runs-on: windows-latest + + steps: + - name: checkout + uses: actions/checkout@v3 + + - name: compress + uses: TheDoctor0/zip-release@0.6.2 + with: + filename: test.zip + #path: # optional, default is . + # Working directory before zipping + #directory: # optional, default is . + # List of excluded files / directories + #exclusions: # optional, default is + # List of excluded files / directories with recursive wildcards (only applies on Windows with `zip` type) + #recursive_exclusions: # optional, default is + # Tool to use for archiving + #type: # optional, default is zip + From 0174d488ac526f75ec9a38b190903ac7f102a965 Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Wed, 9 Nov 2022 18:05:22 -0800 Subject: [PATCH 28/32] Rename map editor output Add "ja2_" prefix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4b91dff7..63f691cae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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/mapeditor_113_${{ env.SHA_SHORT }}.exe + run: mv bin/VS2013/MapEditor_EN_Release_master.exe ja2/ja2_mapeditor_113_${{ env.SHA_SHORT }}.exe - name: Replace GameVersion.cpp (JA2) run: | From 23c113a873f97db05f4d8baa3c157c03c75a050a Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Thu, 10 Nov 2022 02:35:16 -0800 Subject: [PATCH 29/32] Actions (#4) * Create test-action.yml * Update test-action.yml * Update test-action.yml --- .github/workflows/test-action.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/test-action.yml diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml new file mode 100644 index 000000000..0817d2525 --- /dev/null +++ b/.github/workflows/test-action.yml @@ -0,0 +1,21 @@ +name: test-action + +on: workflow_dispatch + +jobs: + build: + runs-on: windows-latest + + steps: + + - name: Get github context vars + run: | + echo "sha=${{ github.sha }}" | Out-File -FilePath $env:GITHUB_ENV -Append + echo "evt=${{ github.event }}" | Out-File -FilePath $env:GITHUB_ENV -Append + + - name: Check vars + run: | + echo "sha=${{ env.sha }}" + echo "evt=${{ env.evt }}" + + From e35fd83d85c7116aff404c429a52bdac2bf9691b Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Fri, 11 Nov 2022 00:40:59 -0800 Subject: [PATCH 30/32] Delete manual-build.yml --- .github/workflows/manual-build.yml | 110 ----------------------------- 1 file changed, 110 deletions(-) delete mode 100644 .github/workflows/manual-build.yml diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml deleted file mode 100644 index 67edef0c3..000000000 --- a/.github/workflows/manual-build.yml +++ /dev/null @@ -1,110 +0,0 @@ -name: manual build - -on: - workflow_dispatch: - -jobs: - build: - runs-on: windows-latest - - steps: - - uses: actions/checkout@v3 - - uses: microsoft/setup-msbuild@v1.1 - - - name: Shorten SHA - run: echo "SHA_SHORT=$(git rev-parse --short ${{ github.sha }})" | Out-File -FilePath $env:GITHUB_ENV -Append - - - name: Get date - run: echo "DATE=$(Get-Date -Format yyyy.MM.dd)" | Out-File -FilePath $env:GITHUB_ENV -Append - - - name: Check vars - run: | - echo "${{ env.SHA_SHORT }}" - echo "${{ env.DATE }}" - - - name: Checkout gamedir - uses: actions/checkout@v3 - with: - repository: 1dot13/gamedir - path: ja2 - - - name: Replace GameVersion.cpp (Map Editor) - run: | - rm GameVersion.cpp - echo @" - #include "Types.h" - #include "GameVersion.h" - - CHAR16 zVersionLabel[256] = { L"Map Editor v1.13 (Development Build) (Github)" }; - CHAR8 czVersionNumber[16] = { "V ${{ env.DATE }}" }; - CHAR16 zTrackingNumber[16] = { L"Z" }; - CHAR16 zRevisionNumber[16] = { L"Hash ${{ env.SHA_SHORT }}" }; - "@ | Out-File -FilePath GameVersion.cpp - - - name: Build Map Editor - run: msbuild ja2_VS2019.sln -property:Configuration=MapEditor - - - name: Rename Map Editor output - run: mv bin/VS2013/MapEditor_EN_Release_master.exe ja2/mapeditor_113_${{ env.SHA_SHORT }}.exe - - - name: Replace GameVersion.cpp (JA2) - run: | - rm GameVersion.cpp - echo @" - #include "Types.h" - #include "GameVersion.h" - - CHAR16 zVersionLabel[256] = { L"Release v1.13 (Development Build) (Github)" }; - CHAR8 czVersionNumber[16] = { "V ${{ env.DATE }}" }; - CHAR16 zTrackingNumber[16] = { L"Z" }; - CHAR16 zRevisionNumber[16] = { L"Hash ${{ env.SHA_SHORT }}" }; - "@ | Out-File -FilePath GameVersion.cpp - - - name: Build JA2 - 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 - - - name: Replace GameVersion.cpp and builddefines.h (JA2 UB) - run: | - rm GameVersion.cpp - echo @" - #include "Types.h" - #include "GameVersion.h" - - CHAR16 zVersionLabel[256] = { L"Release Unfinished Business v1.13 (Development Build) (Github)" }; - CHAR8 czVersionNumber[16] = { "V ${{ env.DATE }}" }; - CHAR16 zTrackingNumber[16] = { L"Z" }; - CHAR16 zRevisionNumber[16] = { L"Hash ${{ env.SHA_SHORT }}" }; - "@ | Out-File -FilePath GameVersion.cpp - - rm builddefines.h - echo @" - #ifndef _BUILDDEFINES_H_ - #define _BUILDDEFINES_H_ - #include "Language Defines.h" - #define JA2UB - #define JA2UBMAPS - #define FORCE_ASSERTS_ON - #define _CRT_SECURE_NO_WARNINGS - #define _CRT_NON_CONFORMING_SWPRINTFS - #define _SCL_SECURE_NO_WARNINGS - #include "Profiler.h" - #endif - "@ | Out-File -FilePath builddefines.h - - - name: Build JA2 UB - 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 - - - name: Upload executable - uses: actions/upload-artifact@v3 - with: - name: ja2_113 - path: | - ja2/ - !ja2/.git/ - From 2fab0f7322858975ab929c7a706756a8570cadab Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Wed, 16 Nov 2022 17:43:28 -0800 Subject: [PATCH 31/32] Fix IMPs having 0 need to sleep --- Laptop/IMP Compile Character.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Laptop/IMP Compile Character.cpp b/Laptop/IMP Compile Character.cpp index ee2469523..808c03e93 100644 --- a/Laptop/IMP Compile Character.cpp +++ b/Laptop/IMP Compile Character.cpp @@ -35,6 +35,7 @@ // how many times should a 'die' be rolled for skills of the same type? #define HOW_MANY_ROLLS_FOR_SAME_SKILL_CHECK 20 +#define IMP_NEED_FOR_SLEEP 7 INT32 AttitudeList[ ATTITUDE_LIST_SIZE ]; INT32 iLastElementInAttitudeList = 0; @@ -191,6 +192,7 @@ void CreateACharacterFromPlayerEnteredStats( void ) gMercProfiles[LaptopSaveInfo.iIMPIndex].usVoiceIndex = iSelectedIMPVoiceSet; gMercProfiles[LaptopSaveInfo.iIMPIndex].Type = PROFILETYPE_IMP; + gMercProfiles[LaptopSaveInfo.iIMPIndex].ubNeedForSleep = IMP_NEED_FOR_SLEEP; // WDS: Advanced start //gMercProfiles[ LaptopSaveInfo.iIMPIndex ].bExpLevel = gGameExternalOptions.ubIMPStartingLevel; From 0f5424f3655683bc57da1bff67ccf9a0cacf64ad Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Wed, 16 Nov 2022 23:25:39 -0800 Subject: [PATCH 32/32] Delete test-action.yml (#6) --- .github/workflows/test-action.yml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 .github/workflows/test-action.yml diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml deleted file mode 100644 index 0817d2525..000000000 --- a/.github/workflows/test-action.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: test-action - -on: workflow_dispatch - -jobs: - build: - runs-on: windows-latest - - steps: - - - name: Get github context vars - run: | - echo "sha=${{ github.sha }}" | Out-File -FilePath $env:GITHUB_ENV -Append - echo "evt=${{ github.event }}" | Out-File -FilePath $env:GITHUB_ENV -Append - - - name: Check vars - run: | - echo "sha=${{ env.sha }}" - echo "evt=${{ env.evt }}" - -