Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libcxx/utils/ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ RUN sudo apt-get update \
&& sudo apt-get install -y \
tzdata

# Install various tools used by the build or the test suite
# TODO add ninja-build once 1.11 is available in Ubuntu, also remove the manual
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And off topic for this PR, but I checked this and Oracular is the first with a new enough package, but you're probably using Noble at the moment as that's the LTS.

https://packages.ubuntu.com/search?suite=all&searchon=names&keywords=ninja-build

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment says we need 1.11, which seems to be available with noble? I think we're still on jammy though, so an upgrade may be a good idea.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh sorry, yes, I read it as wanting > 1.11.

So yeah if you are / will be on Noble, something to keep in mind.

# installation below.
RUN sudo apt-get update \
&& sudo apt-get install -y \
bash \
Expand Down Expand Up @@ -108,9 +111,6 @@ RUN sudo apt-get update \
xz-utils \
&& sudo rm -rf /var/lib/apt/lists/*

# Install various tools used by the build or the test suite
#RUN apt-get update && apt-get install -y ninja-build python3 python3-distutils python3-psutil git gdb ccache
# TODO add ninja-build once 1.11 is available in Ubuntu, also remove the manual installation.
RUN <<EOF
set -e
wget -qO /tmp/ninja.gz https://github.com/ninja-build/ninja/releases/latest/download/ninja-linux.zip
Expand Down
Loading