From 59ffa0e57bea4e10b0454898d7e1c1baee06a7cb Mon Sep 17 00:00:00 2001 From: Mark de Wever Date: Sat, 5 Apr 2025 15:47:09 +0200 Subject: [PATCH 1/2] [libc++][CI] Improves updating Docker image. This makes it easier to build a new Docker image in the CI. Since the new image is not used automatically it's safe to commit these changes directly to main. Then use a PR to test the new image. --- libcxx/utils/ci/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile index af8ebd4d405f2..e0591f0224102 100644 --- a/libcxx/utils/ci/Dockerfile +++ b/libcxx/utils/ci/Dockerfile @@ -44,6 +44,10 @@ ARG BASE_IMAGE FROM $BASE_IMAGE AS builder-base +# Changing this file causes a rebuild of the image in a GitHub action. +# The date uses the ISO format YYYY-MM-DD. +RUN echo "Last forced update executed on 2025-04-05." + # Make sure apt-get doesn't try to prompt for stuff like our time zone, etc. ENV DEBIAN_FRONTEND=noninteractive From 73ef4b648d14eb2389a97f190e49bc5089036a43 Mon Sep 17 00:00:00 2001 From: Mark de Wever Date: Mon, 28 Apr 2025 18:40:56 +0200 Subject: [PATCH 2/2] Address the review comment and update the date. --- libcxx/utils/ci/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile index e0591f0224102..0a1985b02807b 100644 --- a/libcxx/utils/ci/Dockerfile +++ b/libcxx/utils/ci/Dockerfile @@ -45,8 +45,10 @@ ARG BASE_IMAGE FROM $BASE_IMAGE AS builder-base # Changing this file causes a rebuild of the image in a GitHub action. -# The date uses the ISO format YYYY-MM-DD. -RUN echo "Last forced update executed on 2025-04-05." +# However, it does not cause the CI runners to switch to that image +# automatically, that must be done by updating the SHA in the Github workflow +# file. The date uses the ISO format YYYY-MM-DD. +RUN echo "Last forced update executed on 2025-04-28." # Make sure apt-get doesn't try to prompt for stuff like our time zone, etc. ENV DEBIAN_FRONTEND=noninteractive