Skip to content

Commit 6149dff

Browse files
committed
Install ninja on CI builders
Windows CI builds already install ninja. Install it in all the Docker-based builds as well.
1 parent 181ce0e commit 6149dff

File tree

34 files changed

+34
-0
lines changed

34 files changed

+34
-0
lines changed

src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:20.04
33
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/armhf-gnu/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
1414
libc6-dev \
1515
libc6-dev-armhf-cross \
1616
make \
17+
ninja-build \
1718
python3 \
1819
qemu-system-arm \
1920
xz-utils

src/ci/docker/host-x86_64/disabled/asmjs/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/disabled/dist-powerpcspe-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/disabled/dist-sparc64-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/disabled/dist-x86_64-dragonfly/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/disabled/dist-x86_64-haiku/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1616
libcurl4-openssl-dev \
1717
libssl-dev \
1818
make \
19+
ninja-build \
1920
nasm \
2021
pkg-config \
2122
python3 \

src/ci/docker/host-x86_64/disabled/riscv64gc-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
2020
libc6-dev \
2121
libc6-dev-riscv64-cross \
2222
make \
23+
ninja-build \
2324
patch \
2425
python3 \
2526
qemu-system-misc \

src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++-multilib \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/dist-i686-freebsd/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:18.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
clang \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ RUN apt-get update && \
2626
libedit-dev \
2727
libncurses-dev \
2828
make \
29+
ninja-build \
2930
patch \
3031
perl \
3132
pkg-config \

src/ci/docker/host-x86_64/dist-mips-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/dist-mips64-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/dist-mips64el-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/dist-mipsel-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/dist-various-1/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1515
libncurses-dev \
1616
gawk \
1717
make \
18+
ninja-build \
1819
file \
1920
curl \
2021
ca-certificates \

src/ci/docker/host-x86_64/dist-various-2/build-cloudabi-toolchain.sh

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ apt-get install -y --no-install-recommends \
1616
git \
1717
lld-5.0 \
1818
make \
19+
ninja-build \
1920
python \
2021
sudo \
2122
xz-utils

src/ci/docker/host-x86_64/dist-x86_64-freebsd/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:18.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
clang \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ RUN apt-get update && \
2626
libedit-dev \
2727
libncurses-dev \
2828
make \
29+
ninja-build \
2930
patch \
3031
perl \
3132
pkg-config \

src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
wget \
89
curl \

src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++-multilib \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/i686-gnu/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++-multilib \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/mingw-check/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:18.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/test-various/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:18.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/wasm32/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/x86_64-gnu-aux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:19.10
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/x86_64-gnu-distcheck/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/x86_64-gnu-llvm-8/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
g++-arm-linux-gnueabi \
66
make \
7+
ninja-build \
78
file \
89
curl \
910
ca-certificates \

src/ci/docker/host-x86_64/x86_64-gnu-nopt/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:16.04
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:19.10
33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
55
make \
6+
ninja-build \
67
file \
78
curl \
89
ca-certificates \

src/ci/docker/scripts/android-base-apt-get.sh

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ apt-get install -y --no-install-recommends \
1010
git \
1111
libssl-dev \
1212
make \
13+
ninja-build \
1314
pkg-config \
1415
python3 \
1516
sudo \

src/ci/docker/scripts/cross-apt-packages.sh

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ apt-get update && apt-get install -y --no-install-recommends \
1717
libssl-dev \
1818
libtool-bin \
1919
make \
20+
ninja-build \
2021
patch \
2122
pkg-config \
2223
python3 \

0 commit comments

Comments
 (0)