Install ninja on CI builders

Windows CI builds already install ninja. Install it in all the Docker-based builds as well.
2020-07-29 12:22:17 -07:00 · 2020-07-29 12:22:17 -07:00 · 6149dffff9
commit 6149dffff9
parent 181ce0e013
34 changed files with 34 additions and 0 deletions
--- a/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile
+++ b/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:20.04
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/armhf-gnu/Dockerfile
+++ b/src/ci/docker/host-x86_64/armhf-gnu/Dockerfile
@ -14,6 +14,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
      libc6-dev \
      libc6-dev-armhf-cross \
      make \
+      ninja-build \
      python3 \
      qemu-system-arm \
      xz-utils
--- a/src/ci/docker/host-x86_64/disabled/asmjs/Dockerfile
+++ b/src/ci/docker/host-x86_64/disabled/asmjs/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/disabled/dist-powerpcspe-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/disabled/dist-powerpcspe-linux/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/disabled/dist-sparc64-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/disabled/dist-sparc64-linux/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/disabled/dist-x86_64-dragonfly/Dockerfile
+++ b/src/ci/docker/host-x86_64/disabled/dist-x86_64-dragonfly/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/disabled/dist-x86_64-haiku/Dockerfile
+++ b/src/ci/docker/host-x86_64/disabled/dist-x86_64-haiku/Dockerfile
@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
  libcurl4-openssl-dev \
  libssl-dev \
  make \
+  ninja-build \
  nasm \
  pkg-config \
  python3 \
--- a/src/ci/docker/host-x86_64/disabled/riscv64gc-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/disabled/riscv64gc-linux/Dockerfile
@ -20,6 +20,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
    libc6-dev \
    libc6-dev-riscv64-cross \
    make \
+    ninja-build \
    patch \
    python3 \
    qemu-system-misc \
--- a/src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++-multilib \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/dist-i686-freebsd/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-i686-freebsd/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:18.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  clang \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile
@ -26,6 +26,7 @@ RUN apt-get update && \
      libedit-dev \
      libncurses-dev \
      make \
+      ninja-build \
      patch \
      perl \
      pkg-config \
--- a/src/ci/docker/host-x86_64/dist-mips-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-mips-linux/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/dist-mips64-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-mips64-linux/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/dist-mips64el-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-mips64el-linux/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/dist-mipsel-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-mipsel-linux/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-various-1/Dockerfile
@ -15,6 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
  libncurses-dev \
  gawk \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/dist-various-2/build-cloudabi-toolchain.sh
+++ b/src/ci/docker/host-x86_64/dist-various-2/build-cloudabi-toolchain.sh
@ -16,6 +16,7 @@ apt-get install -y --no-install-recommends \
  git \
  lld-5.0 \
  make \
+  ninja-build \
  python \
  sudo \
  xz-utils
--- a/src/ci/docker/host-x86_64/dist-x86_64-freebsd/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-x86_64-freebsd/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:18.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  clang \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
@ -26,6 +26,7 @@ RUN apt-get update && \
      libedit-dev \
      libncurses-dev \
      make \
+      ninja-build \
      patch \
      perl \
      pkg-config \
--- a/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  wget \
  curl \
--- a/src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile
+++ b/src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++-multilib \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/i686-gnu/Dockerfile
+++ b/src/ci/docker/host-x86_64/i686-gnu/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++-multilib \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/mingw-check/Dockerfile
+++ b/src/ci/docker/host-x86_64/mingw-check/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:18.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/test-various/Dockerfile
+++ b/src/ci/docker/host-x86_64/test-various/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:18.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/wasm32/Dockerfile
+++ b/src/ci/docker/host-x86_64/wasm32/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/x86_64-gnu-aux/Dockerfile
+++ b/src/ci/docker/host-x86_64/x86_64-gnu-aux/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile
+++ b/src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:19.10
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/x86_64-gnu-distcheck/Dockerfile
+++ b/src/ci/docker/host-x86_64/x86_64-gnu-distcheck/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-8/Dockerfile
+++ b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-8/Dockerfile
@ -4,6 +4,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  g++-arm-linux-gnueabi \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/x86_64-gnu-nopt/Dockerfile
+++ b/src/ci/docker/host-x86_64/x86_64-gnu-nopt/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile
+++ b/src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:16.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile
+++ b/src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile
@ -3,6 +3,7 @@ FROM ubuntu:19.10
 RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
+  ninja-build \
  file \
  curl \
  ca-certificates \
--- a/src/ci/docker/scripts/android-base-apt-get.sh
+++ b/src/ci/docker/scripts/android-base-apt-get.sh
@ -10,6 +10,7 @@ apt-get install -y --no-install-recommends \
  git \
  libssl-dev \
  make \
+  ninja-build \
  pkg-config \
  python3 \
  sudo \
--- a/src/ci/docker/scripts/cross-apt-packages.sh
+++ b/src/ci/docker/scripts/cross-apt-packages.sh
@ -17,6 +17,7 @@ apt-get update && apt-get install -y --no-install-recommends \
  libssl-dev \
  libtool-bin \
  make \
+  ninja-build \
  patch \
  pkg-config \
  python3 \