From 0688fd94fc7084e9711f2fdfaae2a5754dd6d4a7 Mon Sep 17 00:00:00 2001 From: tcsabina Date: Sun, 11 Sep 2022 23:01:11 +0200 Subject: [PATCH 01/34] Github Actions testing --- .github/workflows/test.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 000000000..89104afbc --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,12 @@ +name: test +on: [push, pull_request] +jobs: + build: + runs-on: windows-latest + steps: + - name: Check out code + uses: actions/checkout@v2 + - name: Build + run: | + EZ_CONFIG_FILE=.config_windows make + \ No newline at end of file From f8860df4d177b52e258f98f7752e1cb55209d4ba Mon Sep 17 00:00:00 2001 From: tcsabina Date: Sun, 11 Sep 2022 23:04:15 +0200 Subject: [PATCH 02/34] Github Actions testing --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 89104afbc..3e4c81253 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,5 +8,4 @@ jobs: uses: actions/checkout@v2 - name: Build run: | - EZ_CONFIG_FILE=.config_windows make - \ No newline at end of file + make From d14adf73bf2c82a63c33b8a007a02830a96e2f09 Mon Sep 17 00:00:00 2001 From: tcsabina Date: Sun, 11 Sep 2022 23:11:30 +0200 Subject: [PATCH 03/34] Github Actions testing --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3e4c81253..3e629f6b5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,4 +8,4 @@ jobs: uses: actions/checkout@v2 - name: Build run: | - make + msbuild From 3f4a05167b467025113d108035319b6d4df793df Mon Sep 17 00:00:00 2001 From: tcsabina Date: Sun, 11 Sep 2022 23:16:26 +0200 Subject: [PATCH 04/34] Github Actions testing --- .github/workflows/test.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3e629f6b5..4be1abe7b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,6 +6,11 @@ jobs: steps: - name: Check out code uses: actions/checkout@v2 - - name: Build + + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1.1 + + - name: Build app for release + run: msbuild ezQuake.vcxproj -t:rebuild -verbosity:diag -property:Configuration=Release run: | msbuild From dc1b85df377c814807c65a1b036df0fb2b16c857 Mon Sep 17 00:00:00 2001 From: tcsabina Date: Sun, 11 Sep 2022 23:17:02 +0200 Subject: [PATCH 05/34] Github Actions testing --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4be1abe7b..825c384fb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,5 +12,4 @@ jobs: - name: Build app for release run: msbuild ezQuake.vcxproj -t:rebuild -verbosity:diag -property:Configuration=Release - run: | msbuild From ba73378118657a4037a141336eb5f100a7173ff3 Mon Sep 17 00:00:00 2001 From: tcsabina Date: Sun, 11 Sep 2022 23:20:56 +0200 Subject: [PATCH 06/34] Github Actions testing --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 825c384fb..0f71275c6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,5 +11,4 @@ jobs: uses: microsoft/setup-msbuild@v1.1 - name: Build app for release - run: msbuild ezQuake.vcxproj -t:rebuild -verbosity:diag -property:Configuration=Release - msbuild + run: msbuild ezQuake.vcxproj -t:rebuild -verbosity:diag -property:Configuration=rls-modern From f9a76118ef23fd684badd5ff3208232b52994ab9 Mon Sep 17 00:00:00 2001 From: tcsabina Date: Sun, 11 Sep 2022 23:24:32 +0200 Subject: [PATCH 07/34] Github Actions testing --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0f71275c6..57b387181 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,4 +11,4 @@ jobs: uses: microsoft/setup-msbuild@v1.1 - name: Build app for release - run: msbuild ezQuake.vcxproj -t:rebuild -verbosity:diag -property:Configuration=rls-modern + run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=rls-modern From 838ed9c08998c4f9504db6795a63b0346bfd0cdb Mon Sep 17 00:00:00 2001 From: tcsabina Date: Sun, 11 Sep 2022 23:30:28 +0200 Subject: [PATCH 08/34] Github Actions testing --- .github/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 57b387181..3f54e52ba 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,5 +10,8 @@ jobs: - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v1.1 - - name: Build app for release + - name: Build txt2c + run: msbuild misc\vstudio\txt2c\txt2c.vcxproj -t:rebuild -property:Configuration=Release + + - name: Build ezQauke run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=rls-modern From 242e5955ee0041f6503691974ebac5a1c4f67c66 Mon Sep 17 00:00:00 2001 From: tcsabina Date: Sun, 11 Sep 2022 23:36:00 +0200 Subject: [PATCH 09/34] Github Actions testing --- .github/workflows/test.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3f54e52ba..82e0efb78 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,5 +13,11 @@ jobs: - name: Build txt2c run: msbuild misc\vstudio\txt2c\txt2c.vcxproj -t:rebuild -property:Configuration=Release + - name: Make dir + run: mkdir .vs + + - name: Copy txt2c + run: cp misc\vstudio\txt2c\.vs\txt2c.exe .vs\ + - name: Build ezQauke run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=rls-modern From a3de2951065db36eb44a612c3238c152d672becb Mon Sep 17 00:00:00 2001 From: tcsabina Date: Sun, 11 Sep 2022 23:47:43 +0200 Subject: [PATCH 10/34] Github Actions testing --- .github/workflows/test.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 82e0efb78..ade0dc391 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,5 +19,11 @@ jobs: - name: Copy txt2c run: cp misc\vstudio\txt2c\.vs\txt2c.exe .vs\ - - name: Build ezQauke + - name: Build modern client run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=rls-modern + + - name: Archive modern client + uses: actions/upload-artifact@v3 + with: + name: ezQuake-glsl + path: .vs\Win32\rls-modern\Output\ezQuake.exe From 108b1776a73519c20d94730e3229bc6cd27249ed Mon Sep 17 00:00:00 2001 From: Toma Date: Tue, 13 Sep 2022 00:35:02 +0200 Subject: [PATCH 11/34] Test 64bit build --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ade0dc391..f5058d15b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: run: cp misc\vstudio\txt2c\.vs\txt2c.exe .vs\ - name: Build modern client - run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=rls-modern + run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=rls-modern;Platform=x64 - name: Archive modern client uses: actions/upload-artifact@v3 From 7b6f1632ff0ef200a61070d85ca7bcaddd6d8fe0 Mon Sep 17 00:00:00 2001 From: Toma Date: Tue, 13 Sep 2022 23:09:18 +0200 Subject: [PATCH 12/34] Attempt to build x64 target --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f5058d15b..415c97772 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: run: cp misc\vstudio\txt2c\.vs\txt2c.exe .vs\ - name: Build modern client - run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=rls-modern;Platform=x64 + run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=rls-modern x64 - name: Archive modern client uses: actions/upload-artifact@v3 From 2cece87bef1a8c09d818a4b11b24cd65870071e6 Mon Sep 17 00:00:00 2001 From: Toma Date: Tue, 13 Sep 2022 23:24:09 +0200 Subject: [PATCH 13/34] Attempt to build x64 target --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 415c97772..cbe738ed9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: run: cp misc\vstudio\txt2c\.vs\txt2c.exe .vs\ - name: Build modern client - run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=rls-modern x64 + run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=rls-modern -property:Platform=x64 - name: Archive modern client uses: actions/upload-artifact@v3 From 5bb34a1c353c5f00ff3118d2d30a5b3b396a42e9 Mon Sep 17 00:00:00 2001 From: Toma Date: Wed, 14 Sep 2022 00:03:20 +0200 Subject: [PATCH 14/34] Added build matrix --- .github/workflows/test.yml | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cbe738ed9..9f50ec764 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,6 +3,36 @@ on: [push, pull_request] jobs: build: runs-on: windows-latest + strategy: + fail-fast: false + matrix: + target: [windows-glsl-x64, windows-glsl-x86, windows-opengl-x64, windows-opengl-x86, windows-combined-x64, windows-combined-x86] + include: + - target: windows-glsl-x64 + config: rls-modern + platform: x64 + output: "x64\rls-modern" + - target: windows-glsl-x86 + config: rls-modern + platform: Win32 + output: "Win32\rls-modern" + - target: windows-opengl-x64 + config: rls-classic + platform: x64 + output: "x64\rls-classic" + - target: windows-opengl-x86 + config: rls-classic + platform: Win32 + output: "Win32\rls-classic" + - target: windows-combined-x64 + config: rls-all + platform: x64 + output: "x64\rls-all" + - target: windows-combined-x86 + config: rls-all + platform: Win32 + output: "Win32\rls-all" + steps: - name: Check out code uses: actions/checkout@v2 @@ -19,11 +49,11 @@ jobs: - name: Copy txt2c run: cp misc\vstudio\txt2c\.vs\txt2c.exe .vs\ - - name: Build modern client - run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=rls-modern -property:Platform=x64 + - name: Build ezquake + run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=${{ matrix.config }} -property:Platform=${{ matrix.platform }} - - name: Archive modern client + - name: Archive 64bit modern client uses: actions/upload-artifact@v3 with: name: ezQuake-glsl - path: .vs\Win32\rls-modern\Output\ezQuake.exe + path: .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.exe From dac514e3a4d0952ec322de3390e60027129b34d7 Mon Sep 17 00:00:00 2001 From: Toma Date: Wed, 14 Sep 2022 00:31:17 +0200 Subject: [PATCH 15/34] Attempt to build all targets --- .github/workflows/test.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9f50ec764..3d9789ceb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,14 +24,14 @@ jobs: config: rls-classic platform: Win32 output: "Win32\rls-classic" - - target: windows-combined-x64 - config: rls-all + - target: windows-combined-dbg-x64 + config: dbg-all platform: x64 - output: "x64\rls-all" - - target: windows-combined-x86 - config: rls-all + output: "x64\dbg-all" + - target: windows-combined-dbg-x86 + config: dbg-all platform: Win32 - output: "Win32\rls-all" + output: "Win32\dbg-all" steps: - name: Check out code @@ -55,5 +55,5 @@ jobs: - name: Archive 64bit modern client uses: actions/upload-artifact@v3 with: - name: ezQuake-glsl + name: ${{ matrix.target }} path: .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.exe From 53692ea2917abf0d11745a090e689ff2b4ef5341 Mon Sep 17 00:00:00 2001 From: Toma Date: Wed, 14 Sep 2022 00:33:54 +0200 Subject: [PATCH 16/34] Added build matrix --- .github/workflows/test.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3d9789ceb..0ffd7ebb4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,27 +11,21 @@ jobs: - target: windows-glsl-x64 config: rls-modern platform: x64 - output: "x64\rls-modern" - target: windows-glsl-x86 config: rls-modern platform: Win32 - output: "Win32\rls-modern" - target: windows-opengl-x64 config: rls-classic platform: x64 - output: "x64\rls-classic" - target: windows-opengl-x86 config: rls-classic platform: Win32 - output: "Win32\rls-classic" - target: windows-combined-dbg-x64 config: dbg-all platform: x64 - output: "x64\dbg-all" - target: windows-combined-dbg-x86 config: dbg-all platform: Win32 - output: "Win32\dbg-all" steps: - name: Check out code From e01bf987fd5c8cb08b1e4608290bd1b2417418f0 Mon Sep 17 00:00:00 2001 From: Toma Date: Wed, 14 Sep 2022 00:35:49 +0200 Subject: [PATCH 17/34] Attempt to build all --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0ffd7ebb4..bc107d4bf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,7 @@ jobs: strategy: fail-fast: false matrix: - target: [windows-glsl-x64, windows-glsl-x86, windows-opengl-x64, windows-opengl-x86, windows-combined-x64, windows-combined-x86] + target: [windows-glsl-x64, windows-glsl-x86, windows-opengl-x64, windows-opengl-x86, windows-combined-dbg-x64, windows-combined-dbg-x86] include: - target: windows-glsl-x64 config: rls-modern From 95f2ddea29e027f7954c784aec57cfec6ee9007f Mon Sep 17 00:00:00 2001 From: Toma Date: Thu, 15 Sep 2022 00:22:24 +0200 Subject: [PATCH 18/34] Using latest VS tools (2022), and fixed the combined release build --- ezQuake.sln | 8 ++++---- ezQuake.vcxproj | 24 ++++++++++++------------ misc/vstudio/txt2c/txt2c.vcxproj | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ezQuake.sln b/ezQuake.sln index 802615767..b9f2b1a04 100644 --- a/ezQuake.sln +++ b/ezQuake.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30611.23 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32825.248 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ezQuake", "ezQuake.vcxproj", "{5147CA71-1D3D-4F61-9847-87B36421C323}" ProjectSection(ProjectDependencies) = postProject @@ -85,8 +85,8 @@ Global {5147CA71-1D3D-4F61-9847-87B36421C323}.rls-all|Any CPU.Build.0 = dbg-all|Win32 {5147CA71-1D3D-4F61-9847-87B36421C323}.rls-all|ARM.ActiveCfg = rls-all|Win32 {5147CA71-1D3D-4F61-9847-87B36421C323}.rls-all|ARM64.ActiveCfg = rls-all|Win32 - {5147CA71-1D3D-4F61-9847-87B36421C323}.rls-all|x64.ActiveCfg = dbg-all|x64 - {5147CA71-1D3D-4F61-9847-87B36421C323}.rls-all|x64.Build.0 = dbg-all|x64 + {5147CA71-1D3D-4F61-9847-87B36421C323}.rls-all|x64.ActiveCfg = rls-all|x64 + {5147CA71-1D3D-4F61-9847-87B36421C323}.rls-all|x64.Build.0 = rls-all|x64 {5147CA71-1D3D-4F61-9847-87B36421C323}.rls-all|x86.ActiveCfg = dbg-all|Win32 {5147CA71-1D3D-4F61-9847-87B36421C323}.rls-all|x86.Build.0 = dbg-all|Win32 {5147CA71-1D3D-4F61-9847-87B36421C323}.rls-classic|Any CPU.ActiveCfg = rls-classic|Win32 diff --git a/ezQuake.vcxproj b/ezQuake.vcxproj index fb454f0aa..1ec372d00 100644 --- a/ezQuake.vcxproj +++ b/ezQuake.vcxproj @@ -68,7 +68,7 @@ Application true - v142 + v143 MultiByte @@ -92,66 +92,66 @@ Application false - v142 + v143 true MultiByte Application false - v142 + v143 true MultiByte Application false - v142 + v143 true MultiByte Application true - v142 + v143 MultiByte Application true - v142 + v143 MultiByte Application true - v142 + v143 MultiByte Application true - v142 + v143 MultiByte Application false - v142 + v143 true MultiByte Application false - v142 + v143 true MultiByte Application false - v142 + v143 true MultiByte @@ -849,7 +849,7 @@ msversion.bat true true true - EZ_FREETYPE_SUPPORT_STATIC;EZ_FREETYPE_SUPPORT;WITH_NQPROGS;XML_STATIC;USE_PR2;__Q_PNG14__;WITH_ZIP;WITH_ZLIB;WITH_JPEG;WITH_PNG;PCRE_STATIC;CURL_STATICLIB;JSS_CAM;_MBCS;%(PreprocessorDefinitions) + EZ_FREETYPE_SUPPORT_STATIC;RENDERER_OPTION_MODERN_OPENGL;RENDERER_OPTION_CLASSIC_OPENGL;EZ_FREETYPE_SUPPORT;WITH_NQPROGS;XML_STATIC;USE_PR2;__Q_PNG14__;WITH_ZIP;WITH_ZLIB;WITH_JPEG;WITH_PNG;PCRE_STATIC;CURL_STATICLIB;JSS_CAM;_MBCS;%(PreprocessorDefinitions) diff --git a/misc/vstudio/txt2c/txt2c.vcxproj b/misc/vstudio/txt2c/txt2c.vcxproj index dfbed4081..d577c1445 100644 --- a/misc/vstudio/txt2c/txt2c.vcxproj +++ b/misc/vstudio/txt2c/txt2c.vcxproj @@ -34,7 +34,7 @@ Application false - v142 + v143 true Unicode @@ -47,7 +47,7 @@ Application false - v142 + v143 true Unicode From 508d5f0369acf859de40edb680a9afc4441499e3 Mon Sep 17 00:00:00 2001 From: Toma Date: Thu, 15 Sep 2022 00:22:50 +0200 Subject: [PATCH 19/34] building release for the combined build --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bc107d4bf..3f1d4214c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,7 @@ jobs: strategy: fail-fast: false matrix: - target: [windows-glsl-x64, windows-glsl-x86, windows-opengl-x64, windows-opengl-x86, windows-combined-dbg-x64, windows-combined-dbg-x86] + target: [windows-glsl-x64, windows-glsl-x86, windows-opengl-x64, windows-opengl-x86, windows-combined-x64, windows-combined-x86] include: - target: windows-glsl-x64 config: rls-modern @@ -20,10 +20,10 @@ jobs: - target: windows-opengl-x86 config: rls-classic platform: Win32 - - target: windows-combined-dbg-x64 + - target: windows-combined-x64 config: dbg-all platform: x64 - - target: windows-combined-dbg-x86 + - target: windows-combined-x86 config: dbg-all platform: Win32 @@ -46,7 +46,7 @@ jobs: - name: Build ezquake run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=${{ matrix.config }} -property:Platform=${{ matrix.platform }} - - name: Archive 64bit modern client + - name: Archive client uses: actions/upload-artifact@v3 with: name: ${{ matrix.target }} From 80a218323c6fd81ee479d6360c4662ead4aa9381 Mon Sep 17 00:00:00 2001 From: Toma Date: Fri, 16 Sep 2022 13:25:32 +0200 Subject: [PATCH 20/34] Use Link Time Code Generation (/LTCG) for all builds --- ezQuake.vcxproj | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ezQuake.vcxproj b/ezQuake.vcxproj index 1ec372d00..ad0d2df0a 100644 --- a/ezQuake.vcxproj +++ b/ezQuake.vcxproj @@ -92,21 +92,21 @@ Application false - v143 + ClangCL true MultiByte Application false - v143 + ClangCL true MultiByte Application false - v143 + ClangCL true MultiByte @@ -137,21 +137,21 @@ Application false - v143 + ClangCL true MultiByte Application false - v143 + ClangCL true MultiByte Application false - v143 + ClangCL true MultiByte @@ -706,6 +706,7 @@ msversion.bat /ignore:4099 /LTCG %(AdditionalOptions) NotSet true + UseLinkTimeCodeGeneration cd $(SolutionDir) @@ -858,6 +859,7 @@ msversion.bat true Setupapi.lib;libsndfile.lib;freetyped.lib;version.lib;imm32.lib;winmm.lib;turbojpeg-static.lib;SDL2.lib;comctl32.lib;wldap32.lib;Winmm.lib;OpenGL32.lib;ws2_32.lib;sdl2.lib;jansson_d.lib;libpng16.lib;zlib.lib;libcurld.lib;libexpat.lib;pcred.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) true + UseLinkTimeCodeGeneration cd $(SolutionDir) From cb1aa0e305924ae01e911c8dfea111e99ec8c8d5 Mon Sep 17 00:00:00 2001 From: Toma Date: Fri, 16 Sep 2022 13:29:13 +0200 Subject: [PATCH 21/34] Use Link Time Code Generation (/LTCG) for all builds --- ezQuake.vcxproj | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/ezQuake.vcxproj b/ezQuake.vcxproj index ad0d2df0a..9f7724ae3 100644 --- a/ezQuake.vcxproj +++ b/ezQuake.vcxproj @@ -92,21 +92,21 @@ Application false - ClangCL + v143 true MultiByte Application false - ClangCL + v143 true MultiByte Application false - ClangCL + v143 true MultiByte @@ -137,21 +137,21 @@ Application false - ClangCL + v143 true MultiByte Application false - ClangCL + v143 true MultiByte Application false - ClangCL + v143 true MultiByte @@ -758,6 +758,7 @@ msversion.bat /ignore:4099 /LTCG %(AdditionalOptions) NotSet true + UseLinkTimeCodeGeneration cd $(SolutionDir) @@ -810,6 +811,7 @@ msversion.bat /ignore:4099 /LTCG %(AdditionalOptions) NotSet true + UseLinkTimeCodeGeneration cd $(SolutionDir) @@ -908,6 +910,7 @@ msversion.bat true Setupapi.lib;libsndfile.lib;freetyped.lib;version.lib;imm32.lib;winmm.lib;turbojpeg-static.lib;SDL2.lib;comctl32.lib;wldap32.lib;Winmm.lib;OpenGL32.lib;ws2_32.lib;sdl2.lib;jansson_d.lib;libpng16.lib;zlib.lib;libcurld.lib;libexpat.lib;pcred.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) true + UseLinkTimeCodeGeneration cd $(SolutionDir) @@ -956,6 +959,7 @@ msversion.bat true Setupapi.lib;libsndfile.lib;freetyped.lib;version.lib;imm32.lib;winmm.lib;turbojpeg-static.lib;SDL2.lib;comctl32.lib;wldap32.lib;Winmm.lib;OpenGL32.lib;ws2_32.lib;sdl2.lib;jansson_d.lib;libpng16.lib;zlib.lib;libcurld.lib;libexpat.lib;pcred.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) true + UseLinkTimeCodeGeneration cd $(SolutionDir) From 3758e9a7d50b6d38bc2fef98e5aca35cb4fe7530 Mon Sep 17 00:00:00 2001 From: Toma Date: Fri, 16 Sep 2022 13:31:30 +0200 Subject: [PATCH 22/34] Using clang as compiler --- ezQuake.vcxproj | 28 ++++++++++++++-------------- fs.h | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ezQuake.vcxproj b/ezQuake.vcxproj index 9f7724ae3..2f1591c54 100644 --- a/ezQuake.vcxproj +++ b/ezQuake.vcxproj @@ -68,90 +68,90 @@ Application true - v143 + ClangCL MultiByte Application true - v143 + ClangCL MultiByte Application true - v142 + ClangCL MultiByte Application true - v142 + ClangCL MultiByte Application false - v143 + ClangCL true MultiByte Application false - v143 + ClangCL true MultiByte Application false - v143 + ClangCL true MultiByte Application true - v143 + ClangCL MultiByte Application true - v143 + ClangCL MultiByte Application true - v143 + ClangCL MultiByte Application true - v143 + ClangCL MultiByte Application false - v143 + ClangCL true MultiByte Application false - v143 + ClangCL true MultiByte Application false - v143 + ClangCL true MultiByte diff --git a/fs.h b/fs.h index 4d4cceb58..2f8f03b45 100644 --- a/fs.h +++ b/fs.h @@ -104,7 +104,7 @@ typedef enum { | FS_LOAD_FILE_PK4 | FS_LOAD_FILE_DOOMWAD | FS_LOAD_FROM_PAKLST, } FS_Load_File_Types; -void FS_AddGameDirectory (char *dir, unsigned int loadstuff); +void FS_AddGameDirectory (char *dir, FS_Load_File_Types loadstuff); char *FS_NextPath (char *prevpath); From 0116b4788df5c011e452a36ab007c87756ca5baa Mon Sep 17 00:00:00 2001 From: Toma Date: Sat, 17 Sep 2022 23:16:24 +0200 Subject: [PATCH 23/34] reverted to default /ltcg, and doing only 64bit builds --- .github/workflows/test.yml | 11 +-------- ezQuake.vcxproj | 48 ++++++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3f1d4214c..8a33cabd5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,26 +6,17 @@ jobs: strategy: fail-fast: false matrix: - target: [windows-glsl-x64, windows-glsl-x86, windows-opengl-x64, windows-opengl-x86, windows-combined-x64, windows-combined-x86] + target: [windows-glsl-x64, windows-opengl-x64, windows-combined-x64] include: - target: windows-glsl-x64 config: rls-modern platform: x64 - - target: windows-glsl-x86 - config: rls-modern - platform: Win32 - target: windows-opengl-x64 config: rls-classic platform: x64 - - target: windows-opengl-x86 - config: rls-classic - platform: Win32 - target: windows-combined-x64 config: dbg-all platform: x64 - - target: windows-combined-x86 - config: dbg-all - platform: Win32 steps: - name: Check out code diff --git a/ezQuake.vcxproj b/ezQuake.vcxproj index 2f1591c54..bf97a6ac5 100644 --- a/ezQuake.vcxproj +++ b/ezQuake.vcxproj @@ -68,90 +68,90 @@ Application true - ClangCL + v143 MultiByte Application true - ClangCL + v143 MultiByte Application true - ClangCL + v143 MultiByte Application true - ClangCL + v143 MultiByte Application false - ClangCL + v143 true MultiByte Application false - ClangCL + v143 true MultiByte Application false - ClangCL + v143 true MultiByte Application true - ClangCL + v143 MultiByte Application true - ClangCL + v143 MultiByte Application true - ClangCL + v143 MultiByte Application true - ClangCL + v143 MultiByte Application false - ClangCL + v143 true MultiByte Application false - ClangCL + v143 true MultiByte Application false - ClangCL + v143 true MultiByte @@ -319,6 +319,7 @@ Setupapi.lib;libspeexdsp.lib;libspeex.lib;libsndfile.lib;freetyped.lib;version.lib;imm32.lib;winmm.lib;turbojpeg-static.lib;SDL2.lib;comctl32.lib;wldap32.lib;Winmm.lib;OpenGL32.lib;ws2_32.lib;sdl2.lib;jansson_d.lib;libpng16.lib;zlib.lib;libcurld.lib;libexpat.lib;pcred.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) /ignore:4099 /LTCG %(AdditionalOptions) + UseFastLinkTimeCodeGeneration cd $(SolutionDir) @@ -372,6 +373,7 @@ msversion.bat Setupapi.lib;libspeexdsp.lib;libspeex.lib;libsndfile.lib;freetyped.lib;version.lib;imm32.lib;winmm.lib;turbojpeg-static.lib;SDL2.lib;comctl32.lib;wldap32.lib;Winmm.lib;OpenGL32.lib;ws2_32.lib;sdl2.lib;jansson_d.lib;libpng16.lib;zlib.lib;libcurld.lib;libexpat.lib;pcred.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) /ignore:4099 /LTCG %(AdditionalOptions) + UseFastLinkTimeCodeGeneration cd $(SolutionDir) @@ -425,6 +427,7 @@ msversion.bat Setupapi.lib;libspeexdsp.lib;libspeex.lib;libsndfile.lib;freetyped.lib;version.lib;imm32.lib;winmm.lib;turbojpeg-static.lib;SDL2.lib;comctl32.lib;wldap32.lib;Winmm.lib;OpenGL32.lib;ws2_32.lib;sdl2.lib;jansson_d.lib;libpng16.lib;zlib.lib;libcurld.lib;libexpat.lib;pcred.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) /ignore:4099 /LTCG %(AdditionalOptions) + UseFastLinkTimeCodeGeneration cd $(SolutionDir) @@ -478,6 +481,7 @@ msversion.bat Setupapi.lib;libspeexdsp.lib;libspeex.lib;libsndfile.lib;freetyped.lib;version.lib;imm32.lib;winmm.lib;turbojpeg-static.lib;SDL2.lib;comctl32.lib;wldap32.lib;Winmm.lib;OpenGL32.lib;ws2_32.lib;sdl2.lib;jansson_d.lib;libpng16.lib;zlib.lib;libcurld.lib;libexpat.lib;pcred.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) /ignore:4099 /LTCG %(AdditionalOptions) + UseFastLinkTimeCodeGeneration cd $(SolutionDir) @@ -531,6 +535,7 @@ msversion.bat Setupapi.lib;libsndfile.lib;freetyped.lib;version.lib;imm32.lib;winmm.lib;turbojpeg-static.lib;SDL2.lib;comctl32.lib;wldap32.lib;Winmm.lib;OpenGL32.lib;ws2_32.lib;sdl2.lib;jansson_d.lib;libpng16.lib;zlib.lib;libcurld.lib;libexpat.lib;pcred.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + UseFastLinkTimeCodeGeneration copy /y $(TargetPath) $(ProjectDir) @@ -574,6 +579,7 @@ msversion.bat Setupapi.lib;libsndfile.lib;freetyped.lib;version.lib;imm32.lib;winmm.lib;turbojpeg-static.lib;SDL2.lib;comctl32.lib;wldap32.lib;Winmm.lib;OpenGL32.lib;ws2_32.lib;sdl2.lib;jansson_d.lib;libpng16.lib;zlib.lib;libcurld.lib;libexpat.lib;pcred.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + UseFastLinkTimeCodeGeneration copy /y $(TargetPath) $(ProjectDir) @@ -617,6 +623,7 @@ msversion.bat Setupapi.lib;libsndfile.lib;freetyped.lib;version.lib;imm32.lib;winmm.lib;turbojpeg-static.lib;SDL2.lib;comctl32.lib;wldap32.lib;Winmm.lib;OpenGL32.lib;ws2_32.lib;sdl2.lib;jansson_d.lib;libpng16.lib;zlib.lib;libcurld.lib;libexpat.lib;pcred.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + UseFastLinkTimeCodeGeneration copy /y $(TargetPath) $(ProjectDir) @@ -660,6 +667,7 @@ msversion.bat Setupapi.lib;libsndfile.lib;freetyped.lib;version.lib;imm32.lib;winmm.lib;turbojpeg-static.lib;SDL2.lib;comctl32.lib;wldap32.lib;Winmm.lib;OpenGL32.lib;ws2_32.lib;sdl2.lib;jansson_d.lib;libpng16.lib;zlib.lib;libcurld.lib;libexpat.lib;pcred.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + UseFastLinkTimeCodeGeneration copy /y $(TargetPath) $(ProjectDir) @@ -706,7 +714,7 @@ msversion.bat /ignore:4099 /LTCG %(AdditionalOptions) NotSet true - UseLinkTimeCodeGeneration + UseFastLinkTimeCodeGeneration cd $(SolutionDir) @@ -758,7 +766,7 @@ msversion.bat /ignore:4099 /LTCG %(AdditionalOptions) NotSet true - UseLinkTimeCodeGeneration + UseFastLinkTimeCodeGeneration cd $(SolutionDir) @@ -811,7 +819,7 @@ msversion.bat /ignore:4099 /LTCG %(AdditionalOptions) NotSet true - UseLinkTimeCodeGeneration + UseFastLinkTimeCodeGeneration cd $(SolutionDir) @@ -861,7 +869,7 @@ msversion.bat true Setupapi.lib;libsndfile.lib;freetyped.lib;version.lib;imm32.lib;winmm.lib;turbojpeg-static.lib;SDL2.lib;comctl32.lib;wldap32.lib;Winmm.lib;OpenGL32.lib;ws2_32.lib;sdl2.lib;jansson_d.lib;libpng16.lib;zlib.lib;libcurld.lib;libexpat.lib;pcred.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) true - UseLinkTimeCodeGeneration + UseFastLinkTimeCodeGeneration cd $(SolutionDir) @@ -910,7 +918,7 @@ msversion.bat true Setupapi.lib;libsndfile.lib;freetyped.lib;version.lib;imm32.lib;winmm.lib;turbojpeg-static.lib;SDL2.lib;comctl32.lib;wldap32.lib;Winmm.lib;OpenGL32.lib;ws2_32.lib;sdl2.lib;jansson_d.lib;libpng16.lib;zlib.lib;libcurld.lib;libexpat.lib;pcred.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) true - UseLinkTimeCodeGeneration + UseFastLinkTimeCodeGeneration cd $(SolutionDir) @@ -959,7 +967,7 @@ msversion.bat true Setupapi.lib;libsndfile.lib;freetyped.lib;version.lib;imm32.lib;winmm.lib;turbojpeg-static.lib;SDL2.lib;comctl32.lib;wldap32.lib;Winmm.lib;OpenGL32.lib;ws2_32.lib;sdl2.lib;jansson_d.lib;libpng16.lib;zlib.lib;libcurld.lib;libexpat.lib;pcred.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) true - UseLinkTimeCodeGeneration + UseFastLinkTimeCodeGeneration cd $(SolutionDir) From 73755affd77f156aada3e7c8aec90303a14fb0bb Mon Sep 17 00:00:00 2001 From: tcsabina Date: Tue, 20 Sep 2022 23:29:58 +0200 Subject: [PATCH 24/34] First version of snapshot deployment --- .../workflows/build-and-deploy-snapshots.yml | 64 +++++++++++++++++++ .../workflows/{test.yml => build-targets.yml} | 0 .gitignore | 1 - 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/build-and-deploy-snapshots.yml rename .github/workflows/{test.yml => build-targets.yml} (100%) diff --git a/.github/workflows/build-and-deploy-snapshots.yml b/.github/workflows/build-and-deploy-snapshots.yml new file mode 100644 index 000000000..26cd9ff7a --- /dev/null +++ b/.github/workflows/build-and-deploy-snapshots.yml @@ -0,0 +1,64 @@ +name: test +on: [push, pull_request] +jobs: + build: + runs-on: windows-latest + strategy: + fail-fast: false + matrix: + target: [windows-glsl-x64, windows-opengl-x64, windows-combined-x64] + include: + - target: windows-glsl-x64 + config: rls-modern + platform: x64 + - target: windows-opengl-x64 + config: rls-classic + platform: x64 + - target: windows-combined-x64 + config: rls-all + platform: x64 + + steps: + - name: Check out code + uses: actions/checkout@v2 + + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1.1 + + - name: Build txt2c + run: msbuild misc\vstudio\txt2c\txt2c.vcxproj -t:rebuild -property:Configuration=Release + + - name: Make dir + run: mkdir .vs + + - name: Copy txt2c + run: cp misc\vstudio\txt2c\.vs\txt2c.exe .vs\ + + - name: Build ezquake + run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=${{ matrix.config }} -property:Platform=${{ matrix.platform }} + + - name: Create checksum + run: | + md5sum .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.exe > .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.md5 + - name: Setup SSH + env: + SSH_AUTH_SOCK: C:\ssh_agent.sock + run: | + Set-Service ssh-agent -StartupType Manual + ssh-agent -a $SSH_AUTH_SOCK > /dev/null + ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}" + - name: Set date + run: | + sudo timedatectl set-timezone Europe/Amsterdam + echo "DATE=$(date "+%Y%m%d-%H%M%S")" >> $GITHUB_ENV + - name: Deploy + env: + SSH_AUTH_SOCK: C:\ssh_agent.sock + run: | + mkdir -p upload/snapshots/${{ matrix.platform }}/${{ matrix.config }} + mkdir -p upload/snapshots/latest/${{ matrix.platform }}/${{ matrix.config }} + cp .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.exe upload/snapshots/${{ matrix.platform }}/${{ matrix.config }}/${{ env.DATE }}_${GITHUB_SHA::7}_ezquake.exe + cp .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.md5 upload/snapshots/${{ matrix.platform }}/${{ matrix.config }}/${{ env.DATE }}_${GITHUB_SHA::7}_ezquake.md5 + cp .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.exe upload/snapshots/latest/${{ matrix.platform }}/${{ matrix.config }}/ezquake.exe + cp .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.md5 upload/snapshots/latest/${{ matrix.platform }}/${{ matrix.config }}/ezquake.md5 + sftp -rp -o 'StrictHostKeyChecking no' -o 'UserKnownHostsFile /dev/null' -P ${{ secrets.SFTP_PORT }} ${{ secrets.SFTP_USERNAME }}@${{ secrets.SFTP_HOST }}:/snapshots <<< $'put -rp upload/snapshots/*' diff --git a/.github/workflows/test.yml b/.github/workflows/build-targets.yml similarity index 100% rename from .github/workflows/test.yml rename to .github/workflows/build-targets.yml diff --git a/.gitignore b/.gitignore index 990d825de..c2b690747 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -.* !.travis.yml ezquake ezquake.exe From f7176860e28530e9ebcd9ebc07c7cf558024ea37 Mon Sep 17 00:00:00 2001 From: tcsabina Date: Tue, 20 Sep 2022 23:48:24 +0200 Subject: [PATCH 25/34] First version of snapshot deployment --- .github/workflows/build-and-deploy-snapshots.yml | 7 +++++-- .github/workflows/build-targets.yml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-deploy-snapshots.yml b/.github/workflows/build-and-deploy-snapshots.yml index 26cd9ff7a..72bca839b 100644 --- a/.github/workflows/build-and-deploy-snapshots.yml +++ b/.github/workflows/build-and-deploy-snapshots.yml @@ -1,4 +1,4 @@ -name: test +name: build and deploy snapshots on: [push, pull_request] jobs: build: @@ -41,13 +41,16 @@ jobs: run: | md5sum .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.exe > .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.md5 - name: Setup SSH + uses: msys2/setup-msys2@v2 + shell: msys2 {0} env: SSH_AUTH_SOCK: C:\ssh_agent.sock run: | - Set-Service ssh-agent -StartupType Manual ssh-agent -a $SSH_AUTH_SOCK > /dev/null ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}" - name: Set date + uses: msys2/setup-msys2@v2 + shell: msys2 {0} run: | sudo timedatectl set-timezone Europe/Amsterdam echo "DATE=$(date "+%Y%m%d-%H%M%S")" >> $GITHUB_ENV diff --git a/.github/workflows/build-targets.yml b/.github/workflows/build-targets.yml index 8a33cabd5..fe3b2449a 100644 --- a/.github/workflows/build-targets.yml +++ b/.github/workflows/build-targets.yml @@ -1,4 +1,4 @@ -name: test +name: build targets on: [push, pull_request] jobs: build: From 6bedbbffb75efc9d0249fb0f3118386e1a8f90cf Mon Sep 17 00:00:00 2001 From: tcsabina Date: Tue, 20 Sep 2022 23:54:28 +0200 Subject: [PATCH 26/34] First version of snapshot deployment --- .github/workflows/build-and-deploy-snapshots.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy-snapshots.yml b/.github/workflows/build-and-deploy-snapshots.yml index 72bca839b..14f5acbb2 100644 --- a/.github/workflows/build-and-deploy-snapshots.yml +++ b/.github/workflows/build-and-deploy-snapshots.yml @@ -40,8 +40,11 @@ jobs: - name: Create checksum run: | md5sum .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.exe > .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.md5 - - name: Setup SSH + + - name: Invoke msys uses: msys2/setup-msys2@v2 + + - name: Setup SSH shell: msys2 {0} env: SSH_AUTH_SOCK: C:\ssh_agent.sock From 6cdb2933f0dd3bb734af5f8a901c4e97c9e99a3f Mon Sep 17 00:00:00 2001 From: tcsabina Date: Tue, 20 Sep 2022 23:55:32 +0200 Subject: [PATCH 27/34] First version of snapshot deployment --- .github/workflows/build-and-deploy-snapshots.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-and-deploy-snapshots.yml b/.github/workflows/build-and-deploy-snapshots.yml index 14f5acbb2..42d46722a 100644 --- a/.github/workflows/build-and-deploy-snapshots.yml +++ b/.github/workflows/build-and-deploy-snapshots.yml @@ -52,7 +52,6 @@ jobs: ssh-agent -a $SSH_AUTH_SOCK > /dev/null ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}" - name: Set date - uses: msys2/setup-msys2@v2 shell: msys2 {0} run: | sudo timedatectl set-timezone Europe/Amsterdam From 78b5784de26e64812d9eaa8af922a4f4031a46e4 Mon Sep 17 00:00:00 2001 From: tcsabina Date: Wed, 21 Sep 2022 00:08:22 +0200 Subject: [PATCH 28/34] First version of snapshot deployment --- .github/workflows/build-and-deploy-snapshots.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-and-deploy-snapshots.yml b/.github/workflows/build-and-deploy-snapshots.yml index 42d46722a..86d3434a5 100644 --- a/.github/workflows/build-and-deploy-snapshots.yml +++ b/.github/workflows/build-and-deploy-snapshots.yml @@ -43,6 +43,8 @@ jobs: - name: Invoke msys uses: msys2/setup-msys2@v2 + with: + install: openssh - name: Setup SSH shell: msys2 {0} From 3857856d55edfd743d25aea350fc01eabfdc35e1 Mon Sep 17 00:00:00 2001 From: tcsabina Date: Wed, 21 Sep 2022 00:14:15 +0200 Subject: [PATCH 29/34] First version of snapshot deployment --- .github/workflows/build-and-deploy-snapshots.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy-snapshots.yml b/.github/workflows/build-and-deploy-snapshots.yml index 86d3434a5..b799d3282 100644 --- a/.github/workflows/build-and-deploy-snapshots.yml +++ b/.github/workflows/build-and-deploy-snapshots.yml @@ -56,7 +56,7 @@ jobs: - name: Set date shell: msys2 {0} run: | - sudo timedatectl set-timezone Europe/Amsterdam + timedatectl set-timezone Europe/Amsterdam echo "DATE=$(date "+%Y%m%d-%H%M%S")" >> $GITHUB_ENV - name: Deploy env: From 4cae571a5831d5ec04011dc90faed1a7ecc23ab5 Mon Sep 17 00:00:00 2001 From: tcsabina Date: Wed, 21 Sep 2022 00:20:56 +0200 Subject: [PATCH 30/34] First version of snapshot deployment --- .github/workflows/build-and-deploy-snapshots.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy-snapshots.yml b/.github/workflows/build-and-deploy-snapshots.yml index b799d3282..9e4463a14 100644 --- a/.github/workflows/build-and-deploy-snapshots.yml +++ b/.github/workflows/build-and-deploy-snapshots.yml @@ -56,7 +56,7 @@ jobs: - name: Set date shell: msys2 {0} run: | - timedatectl set-timezone Europe/Amsterdam + #timedatectl set-timezone Europe/Amsterdam echo "DATE=$(date "+%Y%m%d-%H%M%S")" >> $GITHUB_ENV - name: Deploy env: From d85a1bb7b0c1e540d1b585b41e0b7a8596e348b7 Mon Sep 17 00:00:00 2001 From: tcsabina Date: Wed, 21 Sep 2022 00:28:17 +0200 Subject: [PATCH 31/34] First version of snapshot deployment --- .github/workflows/build-and-deploy-snapshots.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-and-deploy-snapshots.yml b/.github/workflows/build-and-deploy-snapshots.yml index 9e4463a14..a908e3085 100644 --- a/.github/workflows/build-and-deploy-snapshots.yml +++ b/.github/workflows/build-and-deploy-snapshots.yml @@ -57,8 +57,10 @@ jobs: shell: msys2 {0} run: | #timedatectl set-timezone Europe/Amsterdam + #export TZ=CET-1CEST echo "DATE=$(date "+%Y%m%d-%H%M%S")" >> $GITHUB_ENV - name: Deploy + shell: msys2 {0} env: SSH_AUTH_SOCK: C:\ssh_agent.sock run: | From 8d7866a4701250f177ddbed07cdfc09324b2d36a Mon Sep 17 00:00:00 2001 From: tcsabina Date: Wed, 21 Sep 2022 00:36:04 +0200 Subject: [PATCH 32/34] First version of snapshot deployment --- .github/workflows/build-and-deploy-snapshots.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-deploy-snapshots.yml b/.github/workflows/build-and-deploy-snapshots.yml index a908e3085..fb5560638 100644 --- a/.github/workflows/build-and-deploy-snapshots.yml +++ b/.github/workflows/build-and-deploy-snapshots.yml @@ -66,8 +66,8 @@ jobs: run: | mkdir -p upload/snapshots/${{ matrix.platform }}/${{ matrix.config }} mkdir -p upload/snapshots/latest/${{ matrix.platform }}/${{ matrix.config }} - cp .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.exe upload/snapshots/${{ matrix.platform }}/${{ matrix.config }}/${{ env.DATE }}_${GITHUB_SHA::7}_ezquake.exe - cp .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.md5 upload/snapshots/${{ matrix.platform }}/${{ matrix.config }}/${{ env.DATE }}_${GITHUB_SHA::7}_ezquake.md5 - cp .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.exe upload/snapshots/latest/${{ matrix.platform }}/${{ matrix.config }}/ezquake.exe - cp .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.md5 upload/snapshots/latest/${{ matrix.platform }}/${{ matrix.config }}/ezquake.md5 + cp .vs/${{ matrix.platform }}/${{ matrix.config }}/Output/ezQuake.exe upload/snapshots/${{ matrix.platform }}/${{ matrix.config }}/${{ env.DATE }}_${GITHUB_SHA::7}_ezquake.exe + cp .vs/${{ matrix.platform }}/${{ matrix.config }}/Output/ezQuake.md5 upload/snapshots/${{ matrix.platform }}/${{ matrix.config }}/${{ env.DATE }}_${GITHUB_SHA::7}_ezquake.md5 + cp .vs/${{ matrix.platform }}/${{ matrix.config }}/Output/ezQuake.exe upload/snapshots/latest/${{ matrix.platform }}/${{ matrix.config }}/ezquake.exe + cp .vs/${{ matrix.platform }}/${{ matrix.config }}/Output/ezQuake.md5 upload/snapshots/latest/${{ matrix.platform }}/${{ matrix.config }}/ezquake.md5 sftp -rp -o 'StrictHostKeyChecking no' -o 'UserKnownHostsFile /dev/null' -P ${{ secrets.SFTP_PORT }} ${{ secrets.SFTP_USERNAME }}@${{ secrets.SFTP_HOST }}:/snapshots <<< $'put -rp upload/snapshots/*' From fe2d3079901a512ebce968a3b39a8f0185603ce3 Mon Sep 17 00:00:00 2001 From: tcsabina Date: Wed, 21 Sep 2022 00:42:54 +0200 Subject: [PATCH 33/34] First version of snapshot deployment --- .github/workflows/build-and-deploy-snapshots.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy-snapshots.yml b/.github/workflows/build-and-deploy-snapshots.yml index fb5560638..a421e77a0 100644 --- a/.github/workflows/build-and-deploy-snapshots.yml +++ b/.github/workflows/build-and-deploy-snapshots.yml @@ -57,7 +57,7 @@ jobs: shell: msys2 {0} run: | #timedatectl set-timezone Europe/Amsterdam - #export TZ=CET-1CEST + export TZ=CET-1CEST echo "DATE=$(date "+%Y%m%d-%H%M%S")" >> $GITHUB_ENV - name: Deploy shell: msys2 {0} From 39479acfbd806a448cd26565340fed7d2cb6ab54 Mon Sep 17 00:00:00 2001 From: Tamas Csabina Date: Tue, 4 Oct 2022 21:58:19 +0200 Subject: [PATCH 34/34] Added release deploy pipeline and some fine tunings --- .../workflows/build-and-deploy-release.yml | 76 +++++++++++++++++++ .../workflows/build-and-deploy-snapshots.yml | 3 +- .github/workflows/build-targets.yml | 3 +- 3 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/build-and-deploy-release.yml diff --git a/.github/workflows/build-and-deploy-release.yml b/.github/workflows/build-and-deploy-release.yml new file mode 100644 index 000000000..60bc19ec1 --- /dev/null +++ b/.github/workflows/build-and-deploy-release.yml @@ -0,0 +1,76 @@ +name: build and deploy snapshots +on: + release: + types: [published] +jobs: + build: + if: github.repository == 'QW-Group/ezquake-source' + runs-on: windows-latest + strategy: + fail-fast: false + matrix: + target: [windows-glsl-x64, windows-opengl-x64, windows-combined-x64] + include: + - target: windows-glsl-x64 + config: rls-modern + platform: x64 + - target: windows-opengl-x64 + config: rls-classic + platform: x64 + - target: windows-combined-x64 + config: rls-all + platform: x64 + + steps: + - name: Check out code + uses: actions/checkout@v2 + + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1.1 + + - name: Build txt2c + run: msbuild misc\vstudio\txt2c\txt2c.vcxproj -t:rebuild -property:Configuration=Release + + - name: Make dir + run: mkdir .vs + + - name: Copy txt2c + run: cp misc\vstudio\txt2c\.vs\txt2c.exe .vs\ + + - name: Build ezquake + run: msbuild ezQuake.vcxproj -t:rebuild -property:Configuration=${{ matrix.config }} -property:Platform=${{ matrix.platform }} + + - name: Create checksum + run: | + md5sum .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.exe > .vs\${{ matrix.platform }}\${{ matrix.config }}\Output\ezQuake.md5 + + - name: Invoke msys + uses: msys2/setup-msys2@v2 + with: + install: openssh + + - name: Setup SSH + shell: msys2 {0} + env: + SSH_AUTH_SOCK: C:\ssh_agent.sock + run: | + ssh-agent -a $SSH_AUTH_SOCK > /dev/null + ssh-add - <<< "${{ secrets.SSH_PRIVATE_KEY }}" + - name: Set date + shell: msys2 {0} + run: | + #timedatectl set-timezone Europe/Amsterdam + export TZ=CET-1CEST + echo "DATE=$(date "+%Y%m%d-%H%M%S")" >> $GITHUB_ENV + - name: Deploy + shell: msys2 {0} + env: + SSH_AUTH_SOCK: C:\ssh_agent.sock + run: | + mkdir -p upload/releases/${{ matrix.platform }}/${{ matrix.config }} + mkdir -p upload/releases/latest/${{ matrix.platform }}/${{ matrix.config }} + cp .vs/${{ matrix.platform }}/${{ matrix.config }}/Output/ezQuake.exe upload/releases/${{ matrix.platform }}/${{ matrix.config }}/${{ env.DATE }}_${GITHUB_SHA::7}_ezquake.exe + cp .vs/${{ matrix.platform }}/${{ matrix.config }}/Output/ezQuake.md5 upload/releases/${{ matrix.platform }}/${{ matrix.config }}/${{ env.DATE }}_${GITHUB_SHA::7}_ezquake.md5 + cp .vs/${{ matrix.platform }}/${{ matrix.config }}/Output/ezQuake.exe upload/releases/latest/${{ matrix.platform }}/${{ matrix.config }}/ezquake.exe + cp .vs/${{ matrix.platform }}/${{ matrix.config }}/Output/ezQuake.md5 upload/releases/latest/${{ matrix.platform }}/${{ matrix.config }}/ezquake.md5 + sftp -rp -o 'StrictHostKeyChecking no' -o 'UserKnownHostsFile /dev/null' -P ${{ secrets.SFTP_PORT }} ${{ secrets.SFTP_USERNAME }}@${{ secrets.SFTP_HOST }}:/releases <<< $'put -rp upload/releases/*' diff --git a/.github/workflows/build-and-deploy-snapshots.yml b/.github/workflows/build-and-deploy-snapshots.yml index a421e77a0..a64a34db3 100644 --- a/.github/workflows/build-and-deploy-snapshots.yml +++ b/.github/workflows/build-and-deploy-snapshots.yml @@ -1,7 +1,8 @@ name: build and deploy snapshots -on: [push, pull_request] +on: [push] jobs: build: + if: github.repository == 'QW-Group/ezquake-source' runs-on: windows-latest strategy: fail-fast: false diff --git a/.github/workflows/build-targets.yml b/.github/workflows/build-targets.yml index fe3b2449a..04889b91e 100644 --- a/.github/workflows/build-targets.yml +++ b/.github/workflows/build-targets.yml @@ -1,7 +1,8 @@ name: build targets -on: [push, pull_request] +on: [pull_request] jobs: build: + if: github.repository == 'QW-Group/ezquake-source' runs-on: windows-latest strategy: fail-fast: false