Skip to content

Commit

Permalink
ci: don't install ROOT from package managers
Browse files Browse the repository at this point in the history
  • Loading branch information
c-dilks committed Feb 21, 2024
1 parent a791a50 commit 3d856cd
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
2 changes: 0 additions & 2 deletions .github/install-dependency-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ GENERAL_PACKAGE_LIST_LINUX=(
IGUANA_PACKAGE_LIST_LINUX=(
fmt
yaml-cpp
root
)

##############################
Expand All @@ -37,7 +36,6 @@ GENERAL_PACKAGE_LIST_MACOS=(
IGUANA_PACKAGE_LIST_MACOS=(
fmt
yaml-cpp
root
)

#############################################
Expand Down
4 changes: 2 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ hipo_dep = dependency(
)
ROOT_dep = dependency(
'ROOT',
method: 'cmake',
version: run_command('meson' / 'minimum-version.sh', 'ROOT', check: true).stdout().strip(),
required: false,
method: 'cmake',
version: '>=6.28'
)

# list of dependencies
Expand Down
4 changes: 0 additions & 4 deletions meson/minimum-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ case $dep in
result_meson='>=0.7.0'
result_ala='https://archive.archlinux.org/packages/y/yaml-cpp/yaml-cpp-0.7.0-2-x86_64.pkg.tar.zst'
;;
ROOT|root)
result_meson='>=6.28'
result_ala='https://archive.archlinux.org/packages/r/root/root-6.28.08-1-x86_64.pkg.tar.zst'
;;
*)
echo "ERROR: dependency '$dep' is unknown" >&2
exit 1
Expand Down

0 comments on commit 3d856cd

Please sign in to comment.