CI: Update to use vcpkg

Author: tmp64

.github/workflows/main.yml

@@ -14,15 +14,25 @@ on:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
   build:
     strategy:
       matrix:
-        runs-on: [windows-2019, ubuntu-20.04]
+        os:
+          - runs-on: windows-2019
+            vcpkg-triplet: x86-windows-static
+            preset: ci-windows
+          - runs-on: ubuntu-22.04
+            vcpkg-triplet: x86-linux
+            preset: ci-linux
         target: [client, server]
 
     # The type of runner that the job will run on
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ${{ matrix.os.runs-on }}
+
+    env:
+      VCPKG_ROOT: '${{github.workspace}}/vcpkg'
+      VCPKG_DEFAULT_TRIPLET: '${{ matrix.os.vcpkg-triplet }}'
+      VCPKG_DEFAULT_HOST_TRIPLET: '${{ matrix.os.vcpkg-triplet }}'
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -32,30 +42,46 @@ jobs:
           submodules: recursive
           fetch-depth: 0 # Required for automatic versioning
 
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.8
-      
       - name: Install Ubuntu packages
-        if: matrix.runs-on == 'ubuntu-20.04'
+        if: matrix.os.runs-on == 'ubuntu-22.04'
         run: |
           sudo dpkg --add-architecture i386
           sudo apt update || true
-          sudo apt install -y libc6:i386 ninja-build gcc-9-multilib g++-9-multilib libssl1.1:i386 libssl-dev:i386 zlib1g-dev:i386
+          sudo apt install -y libc6:i386 linux-libc-dev:i386 ninja-build gcc-multilib g++-multilib
 
-      - name: Build release
-        id: build
-        run: |
-          python ./scripts/BuildRelease.py --target ${{ matrix.target }} --build-type release --vs 2019 --toolset v141_xp --linux-compiler gcc-9 --out-dir ./_build_out --cmake-args="-DWARNINGS_ARE_ERRORS=ON" --github-actions
+      # Restore artifacts, or setup vcpkg for building artifacts
+      - name: Set up vcpkg
+        uses: lukka/run-vcpkg@v11
+        id: runvcpkg
+        with:
+          vcpkgJsonGlob: 'vcpkg.json'
+          vcpkgDirectory: '${{env.VCPKG_ROOT}}'
+          vcpkgGitCommitId: 'ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0'
+          runVcpkgInstall: false
+
+      # Run CMake+vcpkg+Ninja+CTest to generate/build/test.
+      - name: Build and Test with CMake
+        uses: lukka/run-cmake@v10
+        id: runcmake
+        with:
+          configurePreset: '${{ matrix.os.preset }}'
+          buildPreset: '${{ matrix.os.preset }}'
+          buildPresetAdditionalArgs: "['--target', 'ci-${{ matrix.target }}']"
+          testPreset: '${{ matrix.os.preset }}'
+          testPresetAdditionalArgs: "['-R', '${{ matrix.target }}']"
+        env:
+          VCPKG_FORCE_SYSTEM_BINARIES: 1
 
-      - name: Run tests
+      # Install
+      - name: Install with CMake
         run: |
-          cd ./_build_out/build
-          ctest -R ${{ matrix.target }} --build-config RelWithDebInfo --output-on-failure
+          cd ${{github.workspace}}/_build/${{ matrix.os.preset }}
+          cmake --install . --prefix ${{github.workspace}}/_build/ci-install --component ${{ matrix.target }}
 
+      # Upload result
       - name: Upload build result
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.build.outputs.artifact_name }}
-          path: ./_build_out/BugfixedHL-*.zip
+          name: bhl-cmake-install-${{ matrix.target }}-${{ matrix.os.preset }}
+          path: ${{github.workspace}}/_build/ci-install
+

.gitignore

@@ -11,3 +11,6 @@ CMakeUserPresets.json
 # Ignore .vscode but allow examples
 .vscode/*
 !.vscode/**/*.example.*
+
+# CI stuff
+/vcpkg

CMakeLists.txt

@@ -333,16 +333,17 @@ endif()
 # Libraries
 #-----------------------------------------------------------------
 set( THREADS_PREFER_PTHREAD_FLAG ON )
-find_package( Threads REQUIRED )
 find_package( nlohmann_json CONFIG REQUIRED )
-find_package( unofficial-pcre CONFIG REQUIRED )
 find_package( Python 3.8...<4.0 COMPONENTS Interpreter )
+find_package( Threads REQUIRED )
+find_package( unofficial-pcre CONFIG REQUIRED )
 
 include( cmake/lib/SDL2.cmake )
 
 add_subdirectory( external )
 
 if( WIN32 )
+	find_package( stackwalker CONFIG REQUIRED )
 	include( cmake/lib/DInput.cmake )
 endif()
 
@@ -387,13 +388,6 @@ set( GAME_COMMON_INCLUDE_PATHS
 	${CMAKE_CURRENT_SOURCE_DIR}/src/pm_shared
 )
 
-# Disable PCH for common sources because includes are a mess there
-set_source_files_properties(
-	${GAME_COMMON_SRCS}
-	PROPERTIES
-	SKIP_PRECOMPILE_HEADERS ON
-)
-
 #-----------------------------------------------------------------
 # Source SDK
 #-----------------------------------------------------------------
@@ -442,3 +436,21 @@ add_subdirectory( src/game/client )
 add_subdirectory( src/game/server )
 add_subdirectory( src/tests )
 add_subdirectory( gamedir )
+
+# Disable PCH for common sources because includes are a mess there
+set_source_files_properties(
+	${GAME_COMMON_SRCS}
+	TARGET_DIRECTORY
+		client
+		server
+		bugfixedapi_amxx
+	PROPERTIES
+		SKIP_PRECOMPILE_HEADERS ON
+)
+
+# Add custom targets for CI
+add_custom_target( ci-client )
+add_dependencies( ci-client client test_client )
+
+add_custom_target( ci-server )
+add_dependencies( ci-server server test_server bugfixedapi_amxx )

CMakePresets.json

@@ -3,7 +3,7 @@
   "configurePresets": [
     {
       "name": "default",
-      "binaryDir": "${sourceDir}/_build",
+      "binaryDir": "${sourceDir}/_build/${presetName}",
       "hidden": true,
       "cacheVariables": {
         "CMAKE_EXPORT_COMPILE_COMMANDS": true,
@@ -13,17 +13,83 @@
         "GNU_FORCE_COLORED_OUTPUT": true
       }
     },
+    {
+      "name": "vcpkg-windows",
+      "inherits": ["default"],
+      "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+      "generator": "Ninja",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "VCPKG_HOST_TRIPLET": "x86-windows-static",
+        "VCPKG_TARGET_TRIPLET": "x86-windows-static"
+      }
+    },
     {
       "name": "vcpkg-linux",
       "inherits": ["default"],
-      "toolchainFile": "${env:VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+      "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
       "generator": "Ninja",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "VCPKG_HOST_TRIPLET": "x86-linux",
         "VCPKG_TARGET_TRIPLET": "x86-linux",
         "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/cmake/toolchains/linux-gcc.cmake"
       }
+    },
+    {
+      "name": "ci-base",
+      "hidden": true,
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+        "BUILD_TESTING": true,
+        "GNU_FORCE_COLORED_OUTPUT": false,
+        "USE_UPDATER": true,
+        "WARNINGS_ARE_ERRORS": true
+      }
+    },
+    {
+      "name": "ci-windows",
+      "inherits": ["vcpkg-windows", "ci-base"]
+    },
+    {
+      "name": "ci-linux",
+      "inherits": ["vcpkg-linux", "ci-base"]
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "ci-base",
+      "hidden": true,
+      "inheritConfigureEnvironment": true
+    },
+    {
+      "name": "ci-windows",
+      "inherits": ["ci-base"],
+      "configurePreset": "ci-windows"
+    },
+    {
+      "name": "ci-linux",
+      "inherits": ["ci-base"],
+      "configurePreset": "ci-linux"
+    }
+  ],
+  "testPresets": [
+    {
+      "name": "ci-base",
+      "hidden": true,
+      "output": {
+        "outputOnFailure": true
+      }
+    },
+    {
+      "name": "ci-windows",
+      "inherits": ["ci-base"],
+      "configurePreset": "ci-windows"
+    },
+    {
+      "name": "ci-linux",
+      "inherits": ["ci-base"],
+      "configurePreset": "ci-linux"
     }
   ]
 }

cmake/lib/DInput.cmake

@@ -13,5 +13,5 @@ block()
 
 	# DXGUID
 	add_library( DXGUID SHARED IMPORTED GLOBAL )
-	set_property( TARGET DInput PROPERTY IMPORTED_IMPLIB ${lib_dir}/lib/dxguid.lib )
+	set_property( TARGET DXGUID PROPERTY IMPORTED_IMPLIB ${lib_dir}/lib/dxguid.lib )
 endblock()

src/game/client/CMakeLists.txt

@@ -305,6 +305,7 @@ target_include_directories( client PRIVATE
 	${GAME_COMMON_INCLUDE_PATHS}
 	${SOURCE_SDK_INCLUDE_PATHS}
 	${UPDATER_INCLUDE_PATHS}
+	${CMAKE_SOURCE_DIR}/external/SDL2/include
 )
 
 target_compile_definitions( client PRIVATE
@@ -324,12 +325,8 @@ if( WIN32 )
 		DInput
 		DXGUID
 		Dbghelp
-		StackWalker::StackWalker
+		unofficial::stackwalker::StackWalker
     )
-
-	target_include_directories( client PRIVATE
-		${CMAKE_CURRENT_SOURCE_DIR}/external/SDL2/include
-	)
 else()
 	# Only link with SDL2 on Linux. Windows will conditionally link in runtime.
 	set( CLIENT_PLAT_LIBS