Skip to content

Commit

Permalink
stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Nerixyz committed Feb 3, 2025
1 parent b52e91b commit 6aeda0e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 5 additions & 1 deletion lib/twitch-eventsub-ws/cmake/GenerateJson.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down Expand Up @@ -166,14 +169,15 @@ 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}")

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}"
Expand Down

0 comments on commit 6aeda0e

Please sign in to comment.