From 52d5b293903fcc30faff13c210942f830da0a3d8 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 29 Nov 2017 18:04:42 +0000 Subject: [PATCH] [ci-workers] Add curl and cmake to dependencies --- contrib/ci-workers/vars/Archlinux.yml | 1 + contrib/ci-workers/vars/CentOS.yml | 1 + contrib/ci-workers/vars/Debian.yml | 1 + contrib/ci-workers/vars/Fedora.yml | 1 + contrib/ci-workers/vars/FreeBSD.yml | 1 + contrib/ci-workers/vars/MacOSX.yml | 5 +++-- contrib/ci-workers/vars/Ubuntu.yml | 1 + contrib/ci-workers/vars/default.yml | 2 ++ 8 files changed, 11 insertions(+), 2 deletions(-) diff --git a/contrib/ci-workers/vars/Archlinux.yml b/contrib/ci-workers/vars/Archlinux.yml index 896a10304..50e5577c3 100644 --- a/contrib/ci-workers/vars/Archlinux.yml +++ b/contrib/ci-workers/vars/Archlinux.yml @@ -2,5 +2,6 @@ buildbot_deps: - python2-pip build_deps: + - cmake - multilib/gcc - make diff --git a/contrib/ci-workers/vars/CentOS.yml b/contrib/ci-workers/vars/CentOS.yml index 906f53a42..f577af5c0 100644 --- a/contrib/ci-workers/vars/CentOS.yml +++ b/contrib/ci-workers/vars/CentOS.yml @@ -2,6 +2,7 @@ buildbot_deps: [] # Empty to remove python-pip build_deps: - bzip2 + - cmake - gcc - gcc-c++ - make diff --git a/contrib/ci-workers/vars/Debian.yml b/contrib/ci-workers/vars/Debian.yml index 992224721..5e3e34690 100644 --- a/contrib/ci-workers/vars/Debian.yml +++ b/contrib/ci-workers/vars/Debian.yml @@ -1,6 +1,7 @@ --- build_deps: - build-essential # Depends on g++, libc6-dev, make + - cmake dist_deps: - pkg-config # Required until b556beda264308e040f8d88aca4f2f386a0183d9 is pulled in - python-dev diff --git a/contrib/ci-workers/vars/Fedora.yml b/contrib/ci-workers/vars/Fedora.yml index 1c6b0e0f3..2a7351c69 100644 --- a/contrib/ci-workers/vars/Fedora.yml +++ b/contrib/ci-workers/vars/Fedora.yml @@ -1,5 +1,6 @@ --- build_deps: + - cmake - gcc - gcc-c++ - make diff --git a/contrib/ci-workers/vars/FreeBSD.yml b/contrib/ci-workers/vars/FreeBSD.yml index 65909d71d..4b1f01997 100644 --- a/contrib/ci-workers/vars/FreeBSD.yml +++ b/contrib/ci-workers/vars/FreeBSD.yml @@ -2,6 +2,7 @@ buildbot_deps: - py27-pip build_deps: + - cmake - gcc - gmake dist_deps: diff --git a/contrib/ci-workers/vars/MacOSX.yml b/contrib/ci-workers/vars/MacOSX.yml index 8e2eaa158..80b1ae608 100644 --- a/contrib/ci-workers/vars/MacOSX.yml +++ b/contrib/ci-workers/vars/MacOSX.yml @@ -1,5 +1,6 @@ --- buildbot_deps: - coreutils # For gnproc etc. -# Already installed -build_deps: [] +# Most are already installed +build_deps: + - cmake diff --git a/contrib/ci-workers/vars/Ubuntu.yml b/contrib/ci-workers/vars/Ubuntu.yml index 4acca499b..2cc9fa3ec 100644 --- a/contrib/ci-workers/vars/Ubuntu.yml +++ b/contrib/ci-workers/vars/Ubuntu.yml @@ -1,5 +1,6 @@ --- build_deps: - build-essential # Depends on g++, libc6-dev, make + - cmake dist_deps: - pkg-config # Required until b556beda264308e040f8d88aca4f2f386a0183d9 is pulled in diff --git a/contrib/ci-workers/vars/default.yml b/contrib/ci-workers/vars/default.yml index b3e861932..cc0ae7c98 100644 --- a/contrib/ci-workers/vars/default.yml +++ b/contrib/ci-workers/vars/default.yml @@ -7,6 +7,7 @@ buildbot_deps: # Dependencies required to download files fetch_deps: + - curl # For depends/ - git - wget # For zcutil/fetch-params.sh @@ -18,6 +19,7 @@ conf_deps: # Dependencies required to compile Zcash build_deps: + - cmake - g++ - gcc - make