From be586dede61858febc10475186b7e686c306d41e Mon Sep 17 00:00:00 2001 From: Dino <8dino2@gmail.com> Date: Tue, 4 Feb 2025 15:04:01 -0500 Subject: [PATCH 1/9] Attempt at a windows dll build --- .github/workflows/build.yaml | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ab32396..66f738f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -74,3 +74,41 @@ jobs: build/gamearm64.so build/plugins build/config.lua + + windows_x86_64_build_q2admin: + runs-on: windows-latest + steps: + - uses: actions/checkout@v3 + with: + repository: actionquake/q2admin + ref: ${{ github.ref }} + path: build + + - name: Set up MinGW + uses: egor-tensin/setup-mingw@v2 + with: + platform: x64 + + - name: Install Lua dependencies + run: | + choco install lua51 + choco install luarocks + luarocks install luacheck + + - name: Build q2admin + working-directory: build + run: make -j2 V=1 + env: + CC: "x86_64-w64-mingw32-gcc" + USE_AQTION: "TRUE" + SHLIBEXT: "dll" + + - name: Generate archive + uses: actions/upload-artifact@v3 + with: + name: q2admin-win-x86_64 + path: | + build/gamex86_64.dll + build/plugins + build/config.lua + From 37cbba8b50b65b705b072349995fc4c0668a040b Mon Sep 17 00:00:00 2001 From: Dino <8dino2@gmail.com> Date: Tue, 4 Feb 2025 15:06:10 -0500 Subject: [PATCH 2/9] Upgrade upload-artifact to v4 --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 66f738f..9b7d893 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -33,7 +33,7 @@ jobs: USE_AQTION: "TRUE" - name: Generate archive - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: q2admin-lin-x86_64 path: | @@ -67,7 +67,7 @@ jobs: USE_AQTION: "TRUE" - name: Generate archive - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: q2admin-lin-arm64 path: | @@ -104,7 +104,7 @@ jobs: SHLIBEXT: "dll" - name: Generate archive - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: q2admin-win-x86_64 path: | From 1a1250b83610b50b19fdf0805795d3696f989c01 Mon Sep 17 00:00:00 2001 From: Dino <8dino2@gmail.com> Date: Tue, 4 Feb 2025 15:10:36 -0500 Subject: [PATCH 3/9] Trying choco native mingw --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9b7d893..52206d6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -85,9 +85,9 @@ jobs: path: build - name: Set up MinGW - uses: egor-tensin/setup-mingw@v2 - with: - platform: x64 + run: | + choco install mingw + refreshenv - name: Install Lua dependencies run: | From 1c701d9c5d6063e437375e2bcf9cd9fcab0e1165 Mon Sep 17 00:00:00 2001 From: Dino <8dino2@gmail.com> Date: Tue, 4 Feb 2025 15:12:37 -0500 Subject: [PATCH 4/9] Trying choco native mingw 2 --- .github/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 52206d6..71134a1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -87,7 +87,6 @@ jobs: - name: Set up MinGW run: | choco install mingw - refreshenv - name: Install Lua dependencies run: | From db20218f2d60208b645e52cf503ab8e5f97001eb Mon Sep 17 00:00:00 2001 From: Dino <8dino2@gmail.com> Date: Tue, 4 Feb 2025 15:16:22 -0500 Subject: [PATCH 5/9] Trying choco native mingw 2 --- .github/workflows/build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 71134a1..8a394e6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -91,7 +91,8 @@ jobs: - name: Install Lua dependencies run: | choco install lua51 - choco install luarocks + choco install luarocks --params="'/MW'" + refreshenv luarocks install luacheck - name: Build q2admin From 21d7458d1765f7e347582142b870310294cb3028 Mon Sep 17 00:00:00 2001 From: Dino <8dino2@gmail.com> Date: Tue, 4 Feb 2025 15:19:16 -0500 Subject: [PATCH 6/9] Trying choco native mingw 3 --- .github/workflows/build.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8a394e6..610ee1b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -89,11 +89,14 @@ jobs: choco install mingw - name: Install Lua dependencies + shell: powershell run: | choco install lua51 choco install luarocks --params="'/MW'" + Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1 refreshenv luarocks install luacheck + - name: Build q2admin working-directory: build From 48975da4c7252ba879fcb899550433cf8ca9c9f9 Mon Sep 17 00:00:00 2001 From: Dino <8dino2@gmail.com> Date: Tue, 4 Feb 2025 15:23:48 -0500 Subject: [PATCH 7/9] Trying choco native mingw 4 --- .github/workflows/build.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 610ee1b..51e79ca 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -95,9 +95,13 @@ jobs: choco install luarocks --params="'/MW'" Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1 refreshenv + $env:LUA_INCDIR = "C:\Program Files (x86)\Lua\5.1\include" + $env:LUA_LIBDIR = "C:\Program Files (x86)\Lua\5.1" + luarocks config variables.CC gcc + luarocks config variables.LD gcc luarocks install luacheck - + - name: Build q2admin working-directory: build run: make -j2 V=1 From ae8ad247afe88cf248007952055ebbca9d42d1f7 Mon Sep 17 00:00:00 2001 From: Dino <8dino2@gmail.com> Date: Tue, 4 Feb 2025 15:26:06 -0500 Subject: [PATCH 8/9] Switch over to msvc instead of mingw --- .github/workflows/build.yaml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 51e79ca..7ff6881 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -84,32 +84,23 @@ jobs: ref: ${{ github.ref }} path: build - - name: Set up MinGW - run: | - choco install mingw + - name: Setup MSVC Developer Command Prompt + uses: microsoft/setup-msbuild@v1.1 - name: Install Lua dependencies - shell: powershell run: | choco install lua51 - choco install luarocks --params="'/MW'" - Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1 - refreshenv - $env:LUA_INCDIR = "C:\Program Files (x86)\Lua\5.1\include" - $env:LUA_LIBDIR = "C:\Program Files (x86)\Lua\5.1" - luarocks config variables.CC gcc - luarocks config variables.LD gcc + choco install luarocks luarocks install luacheck - - name: Build q2admin working-directory: build run: make -j2 V=1 env: - CC: "x86_64-w64-mingw32-gcc" + CC: "cl" USE_AQTION: "TRUE" SHLIBEXT: "dll" - + - name: Generate archive uses: actions/upload-artifact@v4 with: From 8c876db2e42dbd4bbc8010119c1d8d35641bced8 Mon Sep 17 00:00:00 2001 From: Dino <8dino2@gmail.com> Date: Tue, 4 Feb 2025 15:33:28 -0500 Subject: [PATCH 9/9] Switch over to msvc instead of mingw 1 --- .github/workflows/build.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7ff6881..9bca898 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -86,7 +86,11 @@ jobs: - name: Setup MSVC Developer Command Prompt uses: microsoft/setup-msbuild@v1.1 - + + - name: Install Visual Studio C++ components + run: | + choco install visualstudio2022-workload-vctools + - name: Install Lua dependencies run: | choco install lua51