CI: Merge AMXX offsets

Author: tmp64

.github/workflows/main.yml

@@ -106,6 +106,10 @@ jobs:
         target: [client, server]
     runs-on: ubuntu-latest
 
+    env:
+      # Must also be updated in src/game/server/CMakeLists.txt
+      AMXX_OFFSET_GENERATOR_VERSION: "1.0.1"
+
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4
@@ -119,6 +123,26 @@ jobs:
           pattern: "*-${{ matrix.target }}-ci-*"
           merge-multiple: true
 
+      # Download amxx-offset-generator
+      - name: Download amxx-offset-generator
+        run: |
+          mkdir -p ${{github.workspace}}/_build/_amxx
+          cd ${{github.workspace}}/_build/_amxx
+          curl -L --output amxx-offset-generator.zip https://github.com/tmp64/amxx-offset-generator/releases/download/v${AMXX_OFFSET_GENERATOR_VERSION}/amxx-offset-generator-v${AMXX_OFFSET_GENERATOR_VERSION}.zip
+          unzip amxx-offset-generator.zip -d .
+
+      # Generate new AMXX offsets
+      - name: Generate AMXX offsets
+        if: matrix.target == 'server'
+        run: >
+          python
+          ${{github.workspace}}/_build/_amxx/amxx-offset-generator-v${AMXX_OFFSET_GENERATOR_VERSION}/create_amxx_files.py
+          --windows $(find ${{github.workspace}}/_build/ci-artifacts -name "bhl-amxx-offsets-windows.json" -print -quit)
+          --linux $(find ${{github.workspace}}/_build/ci-artifacts -name "bhl-amxx-offsets-linux.json" -print -quit)
+          --out $${{github.workspace}}/_build/ci-artifacts/bhl-${{ matrix.target }}-allow-missing-amxx-offsets/valve_addon/addons/amxmodx/data/gamedata/common.games/custom
+          --banner "BugfixedHL-Rebased offset file. Generated using amxx-offset-generator."
+          --file-prefix "bhl"
+
       # Merge them
       - name: Merge artifacts
         id: merge_artifacts
@@ -127,6 +151,7 @@ jobs:
           --artifact-dir ${{github.workspace}}/_build/ci-artifacts
           --out-dir ${{github.workspace}}/_build/ci-out-artifact
           --target ${{ matrix.target }}
+          allow-missing-amxx-offsets
           ci-linux
           ci-windows
 

CMakePresets.json

@@ -51,11 +51,11 @@
     },
     {
       "name": "ci-windows",
-      "inherits": ["vcpkg-windows", "ci-base"]
+      "inherits": ["ci-base", "vcpkg-windows"]
     },
     {
       "name": "ci-linux",
-      "inherits": ["vcpkg-linux", "ci-base"]
+      "inherits": ["ci-base", "vcpkg-linux"]
     }
   ],
   "buildPresets": [

scripts/merge_artifacts.py

@@ -33,7 +33,10 @@ def main():
         artifacts_with_suffix = list(artifact_dir.glob(f'*{name_suffix}', case_sensitive=True))
 
         if len(artifacts_with_suffix) == 0:
-            raise Exception(f'No artifacts found for suffix = {suffix}')
+            if suffix.startswith('allow-missing'):
+                continue
+            else:
+                raise Exception(f'No artifacts found for suffix = {suffix}')
 
         if len(artifacts_with_suffix) > 1:
             print('Found too many artifacts:')

src/game/server/CMakeLists.txt

@@ -219,7 +219,10 @@ set_target_properties( ${TARGET_NAME} PROPERTIES PREFIX "" )
 set_target_properties( ${TARGET_NAME} PROPERTIES OUTPUT_NAME "hl" )
 
 if( GENERATE_AMXX_OFFSETS )
-	set( AMXX_OFFSET_GENERATOR_VERSION "1.0.0" )
+	# Must also be updated in .github/workflows/main.yml
+	# Must also change URL_HASH
+	set( AMXX_OFFSET_GENERATOR_VERSION "1.0.1" )
+
 	set( AMXX_OFFSET_GENERATOR_DIR "${CMAKE_BINARY_DIR}/amxx-offset-generator" )
 	set( AMXX_OFFSETS_SCRIPT "${AMXX_OFFSET_GENERATOR_DIR}/create_amxx_files.py" )
 	set( AMXX_OFFSETS_CLASS_LIST "${CMAKE_CURRENT_SOURCE_DIR}/AmxxOffsetClassList.txt" )
@@ -238,15 +241,6 @@ if( GENERATE_AMXX_OFFSETS )
 		set( AMXX_OFFSETS_DBG_FILE_ARG --so )
 		set( AMXX_OFFSETS_JSON "${CMAKE_BINARY_DIR}/bhl-amxx-offsets-linux.json" )
 		set( AMXX_OFFSETS_SCRIPT_ARG "--linux=${AMXX_OFFSETS_JSON}" )
-
-		# File doesn't have +x set in the ZIP. Fix that.
-		file(
-			CHMOD ${AMXX_OFFSETS_EXEC}
-			PERMISSIONS
-				OWNER_READ OWNER_WRITE OWNER_EXECUTE
-				GROUP_WRITE GROUP_EXECUTE
-				WORLD_READ WORLD_EXECUTE
-		)
 	else()
 		message( FATAL_ERROR "GENERATE_AMXX_OFFSETS is not supported on this platform" )
 	endif()
@@ -255,12 +249,23 @@ if( GENERATE_AMXX_OFFSETS )
 	FetchContent_Declare(
 		amxx-offset-generator
 		URL https://github.com/tmp64/amxx-offset-generator/releases/download/v${AMXX_OFFSET_GENERATOR_VERSION}/amxx-offset-generator-v${AMXX_OFFSET_GENERATOR_VERSION}.zip
-		URL_HASH SHA256=a2e26ea8b94162f505f430094b26eb114fa446f2955db3396394e6c3702e6d50
+		URL_HASH SHA256=8fb1b0dd311cdbade408621bad66bf58c2e3472a8c68d3126a5b7b1b26c6da8e
 		SOURCE_DIR ${AMXX_OFFSET_GENERATOR_DIR}
 	)
 
 	FetchContent_MakeAvailable( amxx-offset-generator )
 
+	if( PLATFORM_LINUX )
+		# File doesn't have +x set in the ZIP. Fix that.
+		file(
+			CHMOD ${AMXX_OFFSETS_EXEC}
+			PERMISSIONS
+				OWNER_READ OWNER_WRITE OWNER_EXECUTE
+				GROUP_WRITE GROUP_EXECUTE
+				WORLD_READ WORLD_EXECUTE
+		)
+	endif()
+
 	# Add command to generate the JSON file and the offset files
 	add_custom_command(
 		TARGET server POST_BUILD