From 9077aaaa5677d479f902caae9eda7dbfa07a7a15 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Sun, 20 Jun 2021 19:11:28 +0500 Subject: [PATCH 01/32] Create msbuild.yml --- .github/workflows/msbuild.yml | 41 +++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 .github/workflows/msbuild.yml diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml new file mode 100644 index 000000000..a24d2bf54 --- /dev/null +++ b/.github/workflows/msbuild.yml @@ -0,0 +1,41 @@ +name: MSBuild + +on: [push] + +env: + # Path to the solution file relative to the root of the project. + SOLUTION_FILE_PATH: . + + # Configuration type to build. + # You can convert this to a build matrix if you need coverage of multiple configuration types. + # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix + BUILD_CONFIGURATION: Release + VALVE_NO_AUTO_P4: 1 + PreferredToolArchitecture: x64 + +jobs: + build: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + + - name: Add MSBuild to PATH + uses: microsoft/setup-msbuild@v1.0.2 + + - name: Restore NuGet packages + working-directory: ${{env.GITHUB_WORKSPACE}} + run: nuget restore ${{env.SOLUTION_FILE_PATH}} + + - name: idk + run: | + - .\download_libs.bat + - msbuild /m /p:Configuration=Debug thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj + - msbuild /m /p:Configuration=Release thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj + - .\creategameprojects_dev.bat + + #- name: Build + # working-directory: ${{env.GITHUB_WORKSPACE}} + # Add additional options to the MSBuild command line here (like platform or verbosity level). + # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference + # run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}} From dd58ed46dc1ded0469280ea93a15ec87e4467777 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Sun, 20 Jun 2021 19:12:55 +0500 Subject: [PATCH 02/32] Update msbuild.yml --- .github/workflows/msbuild.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index a24d2bf54..127f2832f 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -23,10 +23,6 @@ jobs: - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v1.0.2 - - name: Restore NuGet packages - working-directory: ${{env.GITHUB_WORKSPACE}} - run: nuget restore ${{env.SOLUTION_FILE_PATH}} - - name: idk run: | - .\download_libs.bat From 1ce0cf52ca39b951dcc388a79dbe522895eb3dcf Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Sun, 20 Jun 2021 19:15:28 +0500 Subject: [PATCH 03/32] fix multi line --- .github/workflows/msbuild.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 127f2832f..e91720843 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -25,10 +25,10 @@ jobs: - name: idk run: | - - .\download_libs.bat - - msbuild /m /p:Configuration=Debug thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj - - msbuild /m /p:Configuration=Release thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj - - .\creategameprojects_dev.bat + .\download_libs.bat + msbuild /m /p:Configuration=Debug thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj + msbuild /m /p:Configuration=Release thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj + .\creategameprojects_dev.bat #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} From 93b914d83b3e4ab391c224bfaba25f5dd7ebc1cf Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:05:04 +0500 Subject: [PATCH 04/32] REG --- .github/workflows/msbuild.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index e91720843..21f0a79ca 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -22,7 +22,8 @@ jobs: - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v1.0.2 - + - name: Set Registry Value + run: REG ADD KeyName /v HKLM\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\10.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} /f DefaultProjectExtension /t REG_SZ - name: idk run: | .\download_libs.bat From e402f1b06b2551c199f0072d9faf30635cb97f41 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:06:57 +0500 Subject: [PATCH 05/32] Update msbuild.yml --- .github/workflows/msbuild.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 21f0a79ca..d420b5af0 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -4,12 +4,12 @@ on: [push] env: # Path to the solution file relative to the root of the project. - SOLUTION_FILE_PATH: . + #SOLUTION_FILE_PATH: . # Configuration type to build. # You can convert this to a build matrix if you need coverage of multiple configuration types. # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - BUILD_CONFIGURATION: Release + #BUILD_CONFIGURATION: Release VALVE_NO_AUTO_P4: 1 PreferredToolArchitecture: x64 @@ -23,7 +23,7 @@ jobs: - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v1.0.2 - name: Set Registry Value - run: REG ADD KeyName /v HKLM\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\10.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} /f DefaultProjectExtension /t REG_SZ + run: REG ADD HKLM\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\10.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} /f /v DefaultProjectExtension /t REG_SZ - name: idk run: | .\download_libs.bat From 11514d756e6ad2f7975af888e6e815dc4bb0c4b9 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:08:30 +0500 Subject: [PATCH 06/32] Update msbuild.yml --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index d420b5af0..571fda79c 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -23,7 +23,7 @@ jobs: - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v1.0.2 - name: Set Registry Value - run: REG ADD HKLM\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\10.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} /f /v DefaultProjectExtension /t REG_SZ + run: REG ADD HKLM\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\10.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} /f DefaultProjectExtension /t REG_SZ - name: idk run: | .\download_libs.bat From ea67cac213c77d92da7379a024b0661c8320c6a1 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:09:28 +0500 Subject: [PATCH 07/32] Update msbuild.yml --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 571fda79c..762db649c 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -23,7 +23,7 @@ jobs: - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v1.0.2 - name: Set Registry Value - run: REG ADD HKLM\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\10.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} /f DefaultProjectExtension /t REG_SZ + run: REG ADD HKLM\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\10.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} /f /v DefaultProjectExtension /t REG_SZ /d vcproj - name: idk run: | .\download_libs.bat From cf8f905d8fa93d67ec54f6d319683f954f559dc1 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:11:32 +0500 Subject: [PATCH 08/32] fix reg --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 762db649c..4c4445f67 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -23,7 +23,7 @@ jobs: - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v1.0.2 - name: Set Registry Value - run: REG ADD HKLM\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\10.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} /f /v DefaultProjectExtension /t REG_SZ /d vcproj + run: REG ADD HKLM\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\10.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} /t REG_SZ /v DefaultProjectExtension /d vcproj /f - name: idk run: | .\download_libs.bat From 909cd9e076e9ad51f2da4d4c4c65d005472833b4 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:14:08 +0500 Subject: [PATCH 09/32] work pls --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 4c4445f67..57deb85ce 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -23,7 +23,7 @@ jobs: - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v1.0.2 - name: Set Registry Value - run: REG ADD HKLM\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\10.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} /t REG_SZ /v DefaultProjectExtension /d vcproj /f + run: reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\10.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" /t REG_SZ /v DefaultProjectExtension /d vcproj /f - name: idk run: | .\download_libs.bat From 179ca9ee039b14110fa8826e9965725af93c9bb1 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:19:49 +0500 Subject: [PATCH 10/32] build game.sln --- .github/workflows/msbuild.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 57deb85ce..f6d41571f 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -30,7 +30,8 @@ jobs: msbuild /m /p:Configuration=Debug thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj msbuild /m /p:Configuration=Release thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj .\creategameprojects_dev.bat - + - name: Build game.sln + run: msbuild /m /p:Configuration=Release .\game.sln #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). From 17b4a41c8b7834a351f62b7fc1ba7dc9b958f530 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:20:49 +0500 Subject: [PATCH 11/32] use C++17 --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index f6d41571f..93749cfe9 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -31,7 +31,7 @@ jobs: msbuild /m /p:Configuration=Release thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj .\creategameprojects_dev.bat - name: Build game.sln - run: msbuild /m /p:Configuration=Release .\game.sln + run: msbuild /m /p:Configuration=Release /std:c++17 .\game.sln #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). From 5370a37f3796f2c01f6b7314d4d6403110254c54 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:24:41 +0500 Subject: [PATCH 12/32] fix games.sln path --- .github/workflows/msbuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 93749cfe9..236f1fff4 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -30,8 +30,8 @@ jobs: msbuild /m /p:Configuration=Debug thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj msbuild /m /p:Configuration=Release thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj .\creategameprojects_dev.bat - - name: Build game.sln - run: msbuild /m /p:Configuration=Release /std:c++17 .\game.sln + - name: Build games.sln + run: msbuild /m /p:Configuration=Release /std:c++17 .\games.sln #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). From 4de91d0a5e2bb4aa61a3ad307b0552b609c688eb Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:33:31 +0500 Subject: [PATCH 13/32] msvc --- .github/workflows/msbuild.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 236f1fff4..2e71e888e 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -22,6 +22,11 @@ jobs: - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v1.0.2 + - uses: ilammy/msvc-dev-cmd@v1 + with: + arch: amd64_x86 + sdk: 10.0.10240.0 + toolset: 14.0 - name: Set Registry Value run: reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\10.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" /t REG_SZ /v DefaultProjectExtension /d vcproj /f - name: idk From 8d22cf794c3c79f816e94604ccf599f633d31c4a Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:35:28 +0500 Subject: [PATCH 14/32] 8.1 --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 2e71e888e..b49764e07 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -25,7 +25,7 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 with: arch: amd64_x86 - sdk: 10.0.10240.0 + sdk: 8.1 toolset: 14.0 - name: Set Registry Value run: reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\10.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" /t REG_SZ /v DefaultProjectExtension /d vcproj /f From b1d4a604b02072d6982e97fa92f61bdb2341af4c Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:36:57 +0500 Subject: [PATCH 15/32] no sdk --- .github/workflows/msbuild.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index b49764e07..b16b367e8 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -25,7 +25,6 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 with: arch: amd64_x86 - sdk: 8.1 toolset: 14.0 - name: Set Registry Value run: reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\10.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" /t REG_SZ /v DefaultProjectExtension /d vcproj /f From 3f310ea38c11dbab2bac67ed25efe907f9253e82 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:39:51 +0500 Subject: [PATCH 16/32] switch after sln --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index b16b367e8..d0afd44c9 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -35,7 +35,7 @@ jobs: msbuild /m /p:Configuration=Release thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj .\creategameprojects_dev.bat - name: Build games.sln - run: msbuild /m /p:Configuration=Release /std:c++17 .\games.sln + run: msbuild /m /p:Configuration=Release .\games.sln /std:c++17 #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). From f9cb2dafecafd6b1dc80d17a330daf606aa6dbc0 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:40:05 +0500 Subject: [PATCH 17/32] no switch --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index d0afd44c9..ca941ca87 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -35,7 +35,7 @@ jobs: msbuild /m /p:Configuration=Release thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj .\creategameprojects_dev.bat - name: Build games.sln - run: msbuild /m /p:Configuration=Release .\games.sln /std:c++17 + run: msbuild /m /p:Configuration=Release .\games.sln #/std:c++17 #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). From 44e81701d9190a1bd4d3f6c063c1ac5075a6d0e6 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:43:42 +0500 Subject: [PATCH 18/32] disable /m --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index ca941ca87..52fbdcd59 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -35,7 +35,7 @@ jobs: msbuild /m /p:Configuration=Release thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj .\creategameprojects_dev.bat - name: Build games.sln - run: msbuild /m /p:Configuration=Release .\games.sln #/std:c++17 + run: msbuild /p:Configuration=Release .\games.sln #/std:c++17 #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). From a4e542197f3d67664b8487ae843aad96d2fce561 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:47:32 +0500 Subject: [PATCH 19/32] cat --- .github/workflows/msbuild.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 52fbdcd59..146957a2f 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -36,6 +36,7 @@ jobs: .\creategameprojects_dev.bat - name: Build games.sln run: msbuild /p:Configuration=Release .\games.sln #/std:c++17 + - run: type .\games.sln #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). From f9d289f441939bae346722fb8aa334bb494522a0 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:52:15 +0500 Subject: [PATCH 20/32] specify project --- .github/workflows/msbuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 146957a2f..1bc56f03a 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -34,9 +34,9 @@ jobs: msbuild /m /p:Configuration=Debug thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj msbuild /m /p:Configuration=Release thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj .\creategameprojects_dev.bat - - name: Build games.sln - run: msbuild /p:Configuration=Release .\games.sln #/std:c++17 - run: type .\games.sln + - name: Build games.sln + run: msbuild /p:Configuration=Release .\games.sln /t:Client\ (TF) #/std:c++17 #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). From 03332941a8b1dba2376b7ae2b5a65466423eb850 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 14:55:35 +0500 Subject: [PATCH 21/32] fix syntax --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 1bc56f03a..50796ae69 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -36,7 +36,7 @@ jobs: .\creategameprojects_dev.bat - run: type .\games.sln - name: Build games.sln - run: msbuild /p:Configuration=Release .\games.sln /t:Client\ (TF) #/std:c++17 + run: msbuild /p:Configuration=Release .\games.sln /t:Client__TF_ #/std:c++17 #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). From 4f885f465d02c9ed2a5e14b5bcb25113a0815a36 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 15:04:11 +0500 Subject: [PATCH 22/32] build client --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 50796ae69..0db5af0d6 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -36,7 +36,7 @@ jobs: .\creategameprojects_dev.bat - run: type .\games.sln - name: Build games.sln - run: msbuild /p:Configuration=Release .\games.sln /t:Client__TF_ #/std:c++17 + run: msbuild /p:Configuration=Release .\game\client\client_tf.vcxproj # /t:Client__TF_ #/std:c++17 #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). From 771b9701a8827d0e192624e5f626b1b1a3b9ba5b Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Mon, 21 Jun 2021 15:10:14 +0500 Subject: [PATCH 23/32] specify std --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 0db5af0d6..c69443c0d 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -36,7 +36,7 @@ jobs: .\creategameprojects_dev.bat - run: type .\games.sln - name: Build games.sln - run: msbuild /p:Configuration=Release .\game\client\client_tf.vcxproj # /t:Client__TF_ #/std:c++17 + run: msbuild /p:Configuration=Release .\game\client\client_tf.vcxproj /std:c++17 # /t:Client__TF_ #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). From 9615f35acc9e28943fe992c5d81963a256076749 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Tue, 22 Jun 2021 20:43:17 +0500 Subject: [PATCH 24/32] fix --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index c69443c0d..d5d374234 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -36,7 +36,7 @@ jobs: .\creategameprojects_dev.bat - run: type .\games.sln - name: Build games.sln - run: msbuild /p:Configuration=Release .\game\client\client_tf.vcxproj /std:c++17 # /t:Client__TF_ + run: msbuild /p:Configuration=Release .\games.sln /t:Build # /std:c++17 # /t:Client__TF_ #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). From 2a47832af39d810bfd231b2a346977f4b7eee547 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Tue, 22 Jun 2021 20:48:17 +0500 Subject: [PATCH 25/32] specify platform --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index d5d374234..a0438184e 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -36,7 +36,7 @@ jobs: .\creategameprojects_dev.bat - run: type .\games.sln - name: Build games.sln - run: msbuild /p:Configuration=Release .\games.sln /t:Build # /std:c++17 # /t:Client__TF_ + run: msbuild /p:Configuration=Release;Platform=x86 .\games.sln /t:Build # /std:c++17 # /t:Client__TF_ #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). From e4c1e370c12729eeb45b25910f2888c5b32d3e2f Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Tue, 22 Jun 2021 20:51:06 +0500 Subject: [PATCH 26/32] fix commit --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index a0438184e..29a1f70e2 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -36,7 +36,7 @@ jobs: .\creategameprojects_dev.bat - run: type .\games.sln - name: Build games.sln - run: msbuild /p:Configuration=Release;Platform=x86 .\games.sln /t:Build # /std:c++17 # /t:Client__TF_ + run: msbuild "/p:Configuration=Release;Platform=x86 .\games.sln /t:Build" # /std:c++17 # /t:Client__TF_ #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). From 74f08b50ca056d89cce791eb84ef403763d8cea4 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Tue, 22 Jun 2021 21:20:01 +0500 Subject: [PATCH 27/32] build them all --- .github/workflows/msbuild.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 29a1f70e2..9a96b089f 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -35,8 +35,12 @@ jobs: msbuild /m /p:Configuration=Release thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj .\creategameprojects_dev.bat - run: type .\games.sln - - name: Build games.sln - run: msbuild "/p:Configuration=Release;Platform=x86 .\games.sln /t:Build" # /std:c++17 # /t:Client__TF_ + - name: Build appframework + run: msbuild "/p:Configuration=Release;Platform=x86 .\appframework\appframework.vcxproj" + - name: Build bitmap + run: msbuild "/p:Configuration=Release;Platform=x86 .\bitmap\bitmap.vcxproj" + - name: Build Client (TF) + run: msbuild "/p:Configuration=Release;Platform=x86 .\game\client\client_tf.vcxproj /t:Build" #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). From edd42918a04cb139b14ee9af7f81fd8e5c0939c6 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Tue, 22 Jun 2021 21:26:07 +0500 Subject: [PATCH 28/32] fix args? --- .github/workflows/msbuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 9a96b089f..eaaf4cf06 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -36,9 +36,9 @@ jobs: .\creategameprojects_dev.bat - run: type .\games.sln - name: Build appframework - run: msbuild "/p:Configuration=Release;Platform=x86 .\appframework\appframework.vcxproj" + run: msbuild "/p:Configuration=Release;Platform=x86" .\appframework\appframework.vcxproj - name: Build bitmap - run: msbuild "/p:Configuration=Release;Platform=x86 .\bitmap\bitmap.vcxproj" + run: msbuild "/p:Configuration=Release;Platform=x86" .\bitmap\bitmap.vcxproj - name: Build Client (TF) run: msbuild "/p:Configuration=Release;Platform=x86 .\game\client\client_tf.vcxproj /t:Build" #- name: Build From cf4e6b32ecc57359cc11e176074d2df8592fffe7 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Tue, 22 Jun 2021 21:29:46 +0500 Subject: [PATCH 29/32] fix args again --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index eaaf4cf06..75e8b7e8b 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -40,7 +40,7 @@ jobs: - name: Build bitmap run: msbuild "/p:Configuration=Release;Platform=x86" .\bitmap\bitmap.vcxproj - name: Build Client (TF) - run: msbuild "/p:Configuration=Release;Platform=x86 .\game\client\client_tf.vcxproj /t:Build" + run: msbuild "/p:Configuration=Release;Platform=x86" .\game\client\client_tf.vcxproj /t:Build #- name: Build # working-directory: ${{env.GITHUB_WORKSPACE}} # Add additional options to the MSBuild command line here (like platform or verbosity level). From 91ca4cacb62b80ee6ad2105117a8f06bb74e9117 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Tue, 22 Jun 2021 21:35:46 +0500 Subject: [PATCH 30/32] choreoobjects --- .github/workflows/msbuild.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 75e8b7e8b..f3e998bf5 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -39,6 +39,9 @@ jobs: run: msbuild "/p:Configuration=Release;Platform=x86" .\appframework\appframework.vcxproj - name: Build bitmap run: msbuild "/p:Configuration=Release;Platform=x86" .\bitmap\bitmap.vcxproj + + - name: Build choreoobjects + run: msbuild "/p:Configuration=Release;Platform=x86" .\choreoobjects\choreoobjects.vcxproj - name: Build Client (TF) run: msbuild "/p:Configuration=Release;Platform=x86" .\game\client\client_tf.vcxproj /t:Build #- name: Build From bcdc786b0e010c9d91782d62aa3bddb8d5202e64 Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Thu, 24 Jun 2021 11:45:45 +0500 Subject: [PATCH 31/32] cleanup --- .github/workflows/msbuild.yml | 53 +++++++++++++++++------------------ 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index f3e998bf5..d0ace5b63 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -3,49 +3,48 @@ name: MSBuild on: [push] env: - # Path to the solution file relative to the root of the project. - #SOLUTION_FILE_PATH: . - - # Configuration type to build. - # You can convert this to a build matrix if you need coverage of multiple configuration types. - # https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - #BUILD_CONFIGURATION: Release VALVE_NO_AUTO_P4: 1 PreferredToolArchitecture: x64 jobs: build: runs-on: windows-latest + strategy: + matrix: + Configuration: [Debug, Release] steps: - - uses: actions/checkout@v2 - + - name: Checkout + uses: actions/checkout@v2 - name: Add MSBuild to PATH uses: microsoft/setup-msbuild@v1.0.2 - - uses: ilammy/msvc-dev-cmd@v1 + - name: msvc cmd + uses: ilammy/msvc-dev-cmd@v1 with: arch: amd64_x86 toolset: 14.0 + + # Required for creategameprojects - name: Set Registry Value run: reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\VisualStudio\10.0\Projects\{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" /t REG_SZ /v DefaultProjectExtension /d vcproj /f - - name: idk + + - name: Download Libraries + run: .\download_libs.bat + + - name: Build protobuf run: | - .\download_libs.bat - msbuild /m /p:Configuration=Debug thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj - msbuild /m /p:Configuration=Release thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj - .\creategameprojects_dev.bat - - run: type .\games.sln - - name: Build appframework - run: msbuild "/p:Configuration=Release;Platform=x86" .\appframework\appframework.vcxproj - - name: Build bitmap - run: msbuild "/p:Configuration=Release;Platform=x86" .\bitmap\bitmap.vcxproj + msbuild /m /p:Configuration=Debug thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj + msbuild /m /p:Configuration=Release thirdparty\protobuf-2.5.0\vsprojects\libprotobuf.vcxproj + + - name: Create game projects + run: .\creategameprojects_dev.bat + - name: Build bitmap + run: msbuild "/p:Configuration=${{ matrix.Configuration }};Platform=x86" .\bitmap\bitmap.vcxproj - name: Build choreoobjects - run: msbuild "/p:Configuration=Release;Platform=x86" .\choreoobjects\choreoobjects.vcxproj + run: msbuild "/p:Configuration=${{ matrix.Configuration }};Platform=x86" .\choreoobjects\choreoobjects.vcxproj + + - name: Build Server (TF) + run: msbuild "/p:Configuration=${{ matrix.Configuration }};Platform=x86" .\game\server\server_tf.vcxproj /t:Build - name: Build Client (TF) - run: msbuild "/p:Configuration=Release;Platform=x86" .\game\client\client_tf.vcxproj /t:Build - #- name: Build - # working-directory: ${{env.GITHUB_WORKSPACE}} - # Add additional options to the MSBuild command line here (like platform or verbosity level). - # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference - # run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}} + run: msbuild "/p:Configuration=${{ matrix.Configuration }};Platform=x86" .\game\client\client_tf.vcxproj /t:Build From f096de448a7268a384fbbbb0465e180fc893406b Mon Sep 17 00:00:00 2001 From: SupinePandora43 Date: Thu, 24 Jun 2021 11:56:23 +0500 Subject: [PATCH 32/32] linux --- .github/workflows/msbuild.yml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index d0ace5b63..bb4e36dca 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -7,7 +7,7 @@ env: PreferredToolArchitecture: x64 jobs: - build: + windows-build: runs-on: windows-latest strategy: matrix: @@ -48,3 +48,25 @@ jobs: run: msbuild "/p:Configuration=${{ matrix.Configuration }};Platform=x86" .\game\server\server_tf.vcxproj /t:Build - name: Build Client (TF) run: msbuild "/p:Configuration=${{ matrix.Configuration }};Platform=x86" .\game\client\client_tf.vcxproj /t:Build + + # see https://github.com/mastercomfig/team-comtress-2/pull/486 + #linux-build: + # runs-on: ubuntu-latest + # strategy: + # matrix: + # Configuration: [Debug, Release] + # + # steps: + # - name: Checkout + # uses: actions/checkout@v2 + # + # - run: sudo dpkg --add-architecture i386 && apt-get update + # - name: Install dependencies + # run: sudo apt install autoconf automake build-essential fontconfig:i386 g++-multilib libcurl4-gnutls-dev:i386 libfontconfig1:i386 libfontconfig1-dev:i386 libfreetype-dev:i386 libncurses-dev:i386 libopenal-dev:i386 libopenal1:i386 libunwind-dev libunwind-dev:i386 libx11-dev:i386 mesa-common-dev:i386 + + # - name: Build + # run: make -f games.mak NO_CHROOT=1 + # - name: Link + # run: ./link.sh + +