aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-01-06 14:46:19 -0800
committerDylan Baker <dylan@pnwbakers.com>2021-02-06 10:27:04 -0800
commit80ec157e5e02172cd6e2933bc1047fca07f176df (patch)
tree6871060a1a67d35a05209acb228dfe37bd5bff67
parentb28235428df69ba0a90a8f7c0f26db8527ec68a7 (diff)
downloadmeson-80ec157e5e02172cd6e2933bc1047fca07f176df.zip
meson-80ec157e5e02172cd6e2933bc1047fca07f176df.tar.gz
meson-80ec157e5e02172cd6e2933bc1047fca07f176df.tar.bz2
ci: Add bindgen to CI images
-rwxr-xr-xci/ciimage/arch/install.sh2
-rwxr-xr-xci/ciimage/ubuntu-rolling/install.sh1
-rwxr-xr-xrun_project_tests.py4
3 files changed, 6 insertions, 1 deletions
diff --git a/ci/ciimage/arch/install.sh b/ci/ciimage/arch/install.sh
index 683986f..e46d90f 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 507113b..9a4c976 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"
diff --git a/run_project_tests.py b/run_project_tests.py
index 33641d7..14f135a 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -864,6 +864,10 @@ def skippable(suite, test):
if test.endswith('4 qt') and mesonlib.is_osx():
return False
+ # Bindgen isn't available in all distros
+ if test.endswith('12 bindgen'):
+ return False
+
# Other framework tests are allowed to be skipped on other platforms
return True