Skip to content

Commit 789ef89

Browse files
[libcxx] Install ninja in CI container from system repo (#168225)
To fix the TODO now that the ninja version available in the Ubuntu repositories (1.11) is new enough.
1 parent 97a60aa commit 789ef89

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

libcxx/utils/ci/docker/linux-builder-base.dockerfile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ RUN sudo apt-get update \
7070
libxml2-dev \
7171
lsb-release \
7272
make \
73+
ninja-build \
7374
python3 \
7475
python3-dev \
7576
python3-packaging \
@@ -83,14 +84,6 @@ RUN sudo apt-get update \
8384
xz-utils \
8485
&& sudo rm -rf /var/lib/apt/lists/*
8586

86-
RUN <<EOF
87-
set -e
88-
wget -qO /tmp/ninja.gz https://github.com/ninja-build/ninja/releases/latest/download/ninja-linux.zip
89-
gunzip /tmp/ninja.gz
90-
chmod a+x /tmp/ninja
91-
sudo mv /tmp/ninja /usr/local/bin/ninja
92-
EOF
93-
9487
# These two locales are not enabled by default so generate them
9588
RUN <<EOF
9689
set -e

0 commit comments

Comments
 (0)