From 80ec157e5e02172cd6e2933bc1047fca07f176df Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 6 Jan 2021 14:46:19 -0800 Subject: ci: Add bindgen to CI images --- ci/ciimage/arch/install.sh | 2 +- ci/ciimage/ubuntu-rolling/install.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'ci/ciimage') diff --git a/ci/ciimage/arch/install.sh b/ci/ciimage/arch/install.sh index 683986f75..e46d90f46 100755 --- a/ci/ciimage/arch/install.sh +++ b/ci/ciimage/arch/install.sh @@ -12,7 +12,7 @@ pkgs=( itstool gtk3 java-environment=8 gtk-doc llvm clang sdl2 graphviz doxygen vulkan-validation-layers openssh mercurial gtk-sharp-2 qt5-tools libwmf valgrind cmake netcdf-fortran openmpi nasm gnustep-base gettext - python-lxml hotdoc + python-lxml hotdoc rust-bindgen # cuda ) diff --git a/ci/ciimage/ubuntu-rolling/install.sh b/ci/ciimage/ubuntu-rolling/install.sh index 507113b13..9a4c97675 100755 --- a/ci/ciimage/ubuntu-rolling/install.sh +++ b/ci/ciimage/ubuntu-rolling/install.sh @@ -27,6 +27,7 @@ pkgs=( libblocksruntime-dev libperl-dev liblapack-dev libscalapack-mpi-dev + rust-bindgen ) sed -i '/^#\sdeb-src /s/^#//' "/etc/apt/sources.list" -- cgit v1.2.3 From 9cebd29da973553c6e657f7b318ab1d6afbc76e6 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 21 Jan 2021 11:53:09 -0800 Subject: mesonlib: Add better errormessage to typelistify --- ci/ciimage/ubuntu-rolling/install.sh | 2 +- mesonbuild/mesonlib/universal.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ci/ciimage') diff --git a/ci/ciimage/ubuntu-rolling/install.sh b/ci/ciimage/ubuntu-rolling/install.sh index 9a4c97675..da31766a2 100755 --- a/ci/ciimage/ubuntu-rolling/install.sh +++ b/ci/ciimage/ubuntu-rolling/install.sh @@ -27,7 +27,7 @@ pkgs=( libblocksruntime-dev libperl-dev liblapack-dev libscalapack-mpi-dev - rust-bindgen + bindgen ) sed -i '/^#\sdeb-src /s/^#//' "/etc/apt/sources.list" diff --git a/mesonbuild/mesonlib/universal.py b/mesonbuild/mesonlib/universal.py index 4b913a833..7deb24a11 100644 --- a/mesonbuild/mesonlib/universal.py +++ b/mesonbuild/mesonlib/universal.py @@ -1262,10 +1262,10 @@ def typeslistify(item: 'T.Union[_T, T.Sequence[_T]]', if isinstance(item, types): item = T.cast(T.List[_T], [item]) if not isinstance(item, list): - raise MesonException('Item must be a list or one of {!r}'.format(types)) + raise MesonException('Item must be a list or one of {!r}, not {!r}'.format(types, type(item))) for i in item: if i is not None and not isinstance(i, types): - raise MesonException('List item must be one of {!r}'.format(types)) + raise MesonException('List item must be one of {!r}, not {!r}'.format(types, type(i))) return item -- cgit v1.2.3