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

[OMON-793] Add dependency on kafka and protobuf in Monitoring #5712

Merged
merged 5 commits into from
Jan 27, 2025
Merged

[OMON-793] Add dependency on kafka and protobuf in Monitoring #5712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2bc4139
[OMON-793] Add dependency on kafka and protobuf in Monitoring
Barthelemy Dec 9, 2024
84de77c
bump monitoring
sy-c Jan 24, 2025
2a0fa05
bump monitoring
sy-c Jan 24, 2025
20bb238
Update defaults-o2-dataflow.sh
sy-c Jan 27, 2025
83799ab
Update monitoring.sh
sy-c Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions defaults-o2-dataflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ overrides:
- O2
- fmt
- ucx # this one added
Monitoring:
requires:
- boost
- "GCC-Toolchain:(?!osx)"
- curl
- libInfoLogger
- librdkafka # this one added
---
# This file is included in any build recipe and it's only used to set
# environment variables. Which file to actually include can be defined by the
Expand Down
4 changes: 3 additions & 1 deletion monitoring.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: Monitoring
version: "%(tag_basename)s"
tag: v3.18.1
tag: v3.19.1
requires:
- boost
- "GCC-Toolchain:(?!osx)"
Expand All @@ -9,6 +9,7 @@
build_requires:
- CMake
- alibuild-recipe-tools
- protobuf
source: https://github.com/AliceO2Group/Monitoring
incremental_recipe: |
make ${JOBS:+-j$JOBS} install
Expand All @@ -25,6 +26,7 @@
fi

cmake $SOURCEDIR \
-DRDKAFKA_ROOT=${LIBRDKAFKA_ROOT} \

Check notice on line 29 in monitoring.sh

View workflow job for this annotation

GitHub Actions / alidistlint 

Double quote to prevent globbing and word splitting. [SC2086]
-DCMAKE_INSTALL_PREFIX=$INSTALLROOT \
${BOOST_REVISION:+-DBOOST_ROOT=$BOOST_ROOT} \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
Expand Down
Loading