From f128a46104a85d72eca26b967b1e8290f82c780e Mon Sep 17 00:00:00 2001 From: Codex Date: Thu, 22 Oct 2026 22:07:17 +0200 Subject: [PATCH] Keep editor QA out of game packages and retain dependency notices (by Codex) --- .github/workflows/editor.yml | 6 ++++++ CMakeLists.txt | 2 +- tools/package/make_package.py | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/editor.yml b/.github/workflows/editor.yml index 57dece9..ade8246 100644 --- a/.github/workflows/editor.yml +++ b/.github/workflows/editor.yml @@ -6,6 +6,9 @@ on: workflow_dispatch: permissions: contents: read +concurrency: + group: obw-editor-${{ github.ref }} + cancel-in-progress: true jobs: editor: strategy: @@ -27,6 +30,9 @@ jobs: persist-credentials: false - name: Check public sources run: python3 tools/public_release/check_public_tree.py --root . --history --revision HEAD + - name: Existing package boundaries + if: runner.os == 'Linux' + run: python3 tests/package_tests.py - name: Linux dependencies if: runner.os == 'Linux' run: sudo apt-get update && sudo apt-get install -y ninja-build pkg-config libgtk-3-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxi-dev libxfixes-dev libxss-dev libgl1-mesa-dev xvfb xauth xdotool diff --git a/CMakeLists.txt b/CMakeLists.txt index 5cfed66..2aa94b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1068,7 +1068,7 @@ bmh_add_data_test(NAME sportschau_app_tests REQUIRED_OPTIONS BMH_TEST_SPORTSCHAU install(TARGETS openbmh_play openbmh_cli RUNTIME DESTINATION . COMPONENT Runtime) install(FILES README.md LICENSE THIRD_PARTY_NOTICES.md ACKNOWLEDGEMENTS.md CONTRIBUTING.md DESTINATION . COMPONENT Runtime) -install(DIRECTORY docs/ DESTINATION docs COMPONENT Runtime) +install(DIRECTORY docs/ DESTINATION docs COMPONENT Runtime PATTERN "qa" EXCLUDE) if(MSVC) set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .) set(CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT Runtime) diff --git a/tools/package/make_package.py b/tools/package/make_package.py index 58d0cff..6981f96 100644 --- a/tools/package/make_package.py +++ b/tools/package/make_package.py @@ -16,7 +16,9 @@ def validate(directory, windows): 'SDL2-HIDAPI-options.txt', 'SDL2-HIDAPI-original.txt', 'SDL2-yuv2rgb.txt', 'SDL2.txt', 'miniz-source-notices.txt', 'miniz.txt', 'nativefiledialog-extended.txt', 'RmlUi.txt', 'RmlUi-containers.txt', 'RmlUi-fonts.txt', 'RmlUi-Khronos.txt', - 'FreeType.txt', 'FreeType-FTL.txt', 'FreeType-BDF.txt', 'FreeType-PCF.txt', 'FreeType-zlib.txt'} + 'FreeType.txt', 'FreeType-FTL.txt', 'FreeType-BDF.txt', 'FreeType-PCF.txt', 'FreeType-zlib.txt', + 'nlohmann-json.txt', 'cpp-httplib.txt', 'SDL2_image.txt', 'stb-image.txt', + 'libwebp.txt', 'libwebp-PATENTS.txt', 'LunaSVG.txt', 'PlutoVG.txt', 'pugixml.txt'} launcher_assets = {'assets/launcher/' + name for name in ('launcher.rml', 'theme.rcss', 'stadium.tga', 'LatoLatin-Regular.ttf', 'LatoLatin-Bold.ttf')} present = set()