From 565220ee650618613ebe77db7ae0620e865e0ecd Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 13 Jul 2020 20:42:30 +0200 Subject: [PATCH] add new dependencies to ci --- scripts/azure-pipelines/linux/provision-image.sh | 8 ++++++-- scripts/azure-pipelines/osx/azure-pipelines.yml | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 5a59161e6e9a4c..4175d98d3e6032 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -10,8 +10,12 @@ APT_PACKAGES="at curl unzip tar libxt-dev gperf libxaw7-dev cifs-utils \ build-essential g++ gfortran zip libx11-dev libxkbcommon-x11-dev libxi-dev \ libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev \ libxcursor-dev yasm libnuma1 libnuma-dev python-six python3-six python-yaml \ - flex libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \ - xutils-dev dh-autoreconf libgles2-mesa-dev ruby-full pkg-config" + flex libbison-dev libudev-dev libncurses5-dev libxrandr-dev \ + xutils-dev libgles2-mesa-dev ruby-full" + +# Autotools +APT_PACKAGES="$APT_PACKAGES autoconf dh-autoreconf libtool pkg-config autopoint \ + autoconf-archive" # Additionally required by qt5-base APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \ diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index a1949e6f001ed8..d985edfb180126 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -17,7 +17,9 @@ jobs: condition: always() - bash: | brew list autoconf || brew install autoconf + brew list autoconf-archive || brew install autoconf-archive brew list automake || brew install automake + brew list autopoint || brew install autopoint brew list libtool || brew install libtool brew list pkg-config || brew install pkg-config brew list bison || brew install bison