Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable the web plugin on macOS #4159

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+13 −8
Open

Disable the web plugin on macOS #4159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4781200
Disable the `web` plugin on macOS
dominiklohmann Apr 25, 2024
b4039c5
Assert that plugins are sorted by name
dominiklohmann Apr 25, 2024
b04ed29
Merge branch 'main' into topic/disable-web-plugin-macos
dominiklohmann May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 3 additions & 7 deletions .github/workflows/tenzir.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,13 +582,9 @@ jobs:
dependencies-script-path: scripts/macOS/install-dev-dependencies.sh
cmake-extra-flags: -DTENZIR_ENABLE_BUNDLED_CAF:BOOL=ON
bundled-plugins:
# - Parquet uses illegal instructions on macOS in Arrow version
# 14.0.1, so we disable it in the macOS CI. Last checked on
# 2023-12-16.
# - The http-parser package is disabled on Hoembrew, which means
# we cannot build the web plugin on macOS anymore. Last checked
# on 2024-01-31.
- plugins/[^(parquet)(web)]*
# macOS runners in GitHub Actions CI are very limited, so we
# prefer to have fewer jobs running and build the proprietary
# plugins as bundled on macOS.
- contrib/tenzir-plugins/*
env:
BUILD_DIR: build
Expand Down
3 changes: 2 additions & 1 deletion libtenzir/src/plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,8 @@ load(const std::vector<std::string>& bundled_plugins,
}
get_mutable().erase(removed, get_mutable().end());
// Sort loaded plugins by name (case-insensitive).
std::sort(get_mutable().begin(), get_mutable().end());
std::ranges::sort(get_mutable());
TENZIR_ASSERT(std::ranges::is_sorted(get()));
return loaded_plugin_paths;
}

Expand Down
8 changes: 8 additions & 0 deletions plugins/web/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
cmake_minimum_required(VERSION 3.19...3.28 FATAL_ERROR)

if (APPLE)
message(
WARNING
"The http_parser library is unmaintained and no longer available on macOS; disabling the web plugin"
)
return()
endif ()

project(
web
DESCRIPTION "Web plugin for Tenzir"
Expand Down