This is an archive of the discontinued LLVM Phabricator instance.

[libc++][CI] Updates Docker image.
ClosedPublic

Authored by Mordante on May 30 2022, 9:35 AM.

Details

Summary
  • Updates the image to use Ubuntu Jammy.
  • Installs GCC-12 as preparation to migrate to that GCC version.

Diff Detail

Event Timeline

Mordante created this revision.May 30 2022, 9:35 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 30 2022, 9:35 AM
Herald added a subscriber: arichardson. · View Herald Transcript
Mordante requested review of this revision.May 30 2022, 9:35 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 30 2022, 9:35 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Mordante retitled this revision from [libc++][CI] Updates CI Docker image. to [libc++][CI] Updates Docker image..May 30 2022, 9:36 AM
jloser accepted this revision.May 30 2022, 10:10 AM
jloser added a subscriber: jloser.

LGTM % a typo nit.

libcxx/utils/ci/Dockerfile
59

s/LVM/LLVM, please.

ldionne requested changes to this revision.May 31 2022, 9:11 AM

If we can't install LLVM 12 with jammy, we might have to wait until we branch for LLVM 15 (in a couple of months) before we can land this. Once we branch LLVM 15, our latest-2 will become LLVM 13, which should work with jammy.

libcxx/utils/ci/Dockerfile
58–63

I think this comment should be reworded to something like:

# We also install <latest-2> because we need to support the "latest-1" of the current release branch,
# which is effectively the <latest-2> of the tip-of-trunk LLVM. For example, after branching LLVM 14
# but before branching LLVM 15, we still need to have Clang 12 in this Docker image because the LLVM
# 14 release branch CI uses it. The tip-of-trunk CI will never use Clang 12, though.
67–69

As explained above, the problem with removing this line as-is is that it's going to break CI on release/14.x.

This revision now requires changes to proceed.May 31 2022, 9:11 AM
Mordante marked 3 inline comments as done.Jun 3 2022, 9:06 AM
Mordante added inline comments.
libcxx/utils/ci/Dockerfile
59

Good catch, thanks. I'll update it before landing unless there are other review comments.

67–69

As discussed during the online review Ubuntu Jammy ships clang-12, so I'll use that.

Mordante updated this revision to Diff 434042.Jun 3 2022, 9:06 AM
Mordante marked 2 inline comments as done.

Addresses review comments.

ldionne accepted this revision.Jun 7 2022, 8:34 AM

LGTM, thanks! Once we land this, let's monitor the bots a bit more closely in case something breaks.

libcxx/utils/ci/Dockerfile
92

Nitpick, but can we switch the order?

This revision is now accepted and ready to land.Jun 7 2022, 8:34 AM
Mordante marked an inline comment as done.Jun 7 2022, 9:52 AM
This revision was landed with ongoing or failed builds.Jun 7 2022, 9:52 AM
This revision was automatically updated to reflect the committed changes.
Mordante reopened this revision.Jun 8 2022, 10:19 AM
This revision is now accepted and ready to land.Jun 8 2022, 10:19 AM
This revision was automatically updated to reflect the committed changes.