From 6aeda0e313997f7277472dccb066f1173873e3d3 Mon Sep 17 00:00:00 2001
From: Nerixyz <nerixdev@outlook.de>
Date: Mon, 3 Feb 2025 18:20:30 +0100
Subject: [PATCH] stuff

---
 .github/workflows/build.yml                     | 9 +++++----
 CHANGELOG.md                                    | 2 +-
 lib/twitch-eventsub-ws/cmake/GenerateJson.cmake | 6 +++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0cb63101cb9..8aae4bde25a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,10 +71,11 @@ jobs:
         run: |
           git config --global --add safe.directory '*'
 
-      - name: Setup Python 3.13
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
+      - name: Install Python
+        run: |
+          sudo apt update
+          sudo DEBIAN_FRONTEND=noninteractive apt -y --no-install-recommends install \
+            python3 python3-venv
 
       - name: Build
         run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e5f934cbe3..822b383e43d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@
 - Bugfix: Fixed announcements not showing up in mentions tab. (#5857)
 - Bugfix: Fixed the reply button showing for inline whispers and announcements. (#5863)
 - Bugfix: Fixed suspicious user treatment update messages not being searchable. (#5865)
-- Dev: Add initial experimental EventSub support. (#5837, #5895)
+- Dev: Add initial experimental EventSub support. (#5837, #5895, #5897)
 - Dev: Highlight checks now use non-capturing groups for the boundaries. (#5784)
 - Dev: Updated Conan dependencies. (#5776)
 - Dev: Disable QT keywords (i.e. `emit`, `slots`, and `signals`). (#5882)
diff --git a/lib/twitch-eventsub-ws/cmake/GenerateJson.cmake b/lib/twitch-eventsub-ws/cmake/GenerateJson.cmake
index 972a79084cc..16183199c00 100644
--- a/lib/twitch-eventsub-ws/cmake/GenerateJson.cmake
+++ b/lib/twitch-eventsub-ws/cmake/GenerateJson.cmake
@@ -50,6 +50,9 @@ function(_make_and_use_venv)
     cmake_path(GET Python3_EXECUTABLE FILENAME _py3_exe)
     string(REPLACE python pip _pip3_exe "${_py3_exe}")
     cmake_path(REPLACE_FILENAME Python3_EXECUTABLE "${_pip3_exe}" OUTPUT_VARIABLE _pip3_path)
+    if(NOT EXISTS "${_pip3_path}" AND "${_pip3_path}" MATCHES pip3.exe$)
+        string(REGEX REPLACE pip3.exe$ pip.exe _pip3_path "${_pip3_path}")
+    endif()
     message(STATUS "Using pip ${_pip3_path}")
 
     message(STATUS "Installing requirements from ${arg_REQUIREMENTS}")
@@ -166,6 +169,7 @@ function(generate_json_impls)
         string(REGEX REPLACE \.hpp$ .cpp _source_path "${_header}")
         string(REGEX REPLACE include[/\\]twitch-eventsub-ws[/\\] src/generated/ _source_path "${_source_path}")
 
+        cmake_path(ABSOLUTE_PATH _header BASE_DIRECTORY "${arg_BASE_DIRECTORY}")
         cmake_path(ABSOLUTE_PATH _def_path BASE_DIRECTORY "${arg_BASE_DIRECTORY}")
         cmake_path(ABSOLUTE_PATH _source_path BASE_DIRECTORY "${arg_BASE_DIRECTORY}")
         list(APPEND _all_sources "${_source_path}")
@@ -173,7 +177,7 @@ function(generate_json_impls)
         if(_generation_supported)
             add_custom_command(
                 OUTPUT "${_source_path}" "${_def_path}"
-                DEPENDS ${_gen_deps}
+                DEPENDS ${_gen_deps} "${_header}"
                 COMMENT "Generating implementation for ${_header}"
                 COMMAND "${_python3_path}" "${_gen_script}" "${_header}" --includes "${_inc_dirs}"
                 WORKING_DIRECTORY "${arg_BASE_DIRECTORY}"