[libcxx-commits] [libcxx] 7235326 - [libc++] Upgrade the Clang on build bots

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-09-14T13:52:01-04:00
New Revision: 7235326fb2342227d478d63378d2ba4d5e2418db

URL: https://github.com/llvm/llvm-project/commit/7235326fb2342227d478d63378d2ba4d5e2418db
DIFF: https://github.com/llvm/llvm-project/commit/7235326fb2342227d478d63378d2ba4d5e2418db.diff

LOG: [libc++] Upgrade the Clang on build bots

Added: 
    

Modified: 
    libcxx/utils/docker/debian9/buildbot/Dockerfile
    libcxx/utils/docker/debian9/buildbot/docker-compose.yml

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/docker/debian9/buildbot/Dockerfile b/libcxx/utils/docker/debian9/buildbot/Dockerfile
index ea2ac9d55933..7da50687b952 100644
--- a/libcxx/utils/docker/debian9/buildbot/Dockerfile
+++ b/libcxx/utils/docker/debian9/buildbot/Dockerfile
@@ -14,7 +14,6 @@ ADD install-packages.sh /tmp/
 RUN /tmp/install-packages.sh && rm /tmp/install-packages.sh
 
 COPY --from=ericwf/gcc:5.5.0 /compiler /opt/gcc-5
-COPY --from=ericwf/llvm:9.x /compiler /opt/llvm-9
 
 FROM base-image as worker-image
 

diff  --git a/libcxx/utils/docker/debian9/buildbot/docker-compose.yml b/libcxx/utils/docker/debian9/buildbot/docker-compose.yml
index f9a2a2ad9c31..b65a91e4e255 100644
--- a/libcxx/utils/docker/debian9/buildbot/docker-compose.yml
+++ b/libcxx/utils/docker/debian9/buildbot/docker-compose.yml
@@ -5,7 +5,7 @@ services:
       context: https://github.com/llvm/llvm-project.git#master:libcxx/utils/docker/debian9/buildbot
       args:
         gcc_tot: "ericwf/gcc:9.2.0"
-        llvm_tot: "ericwf/llvm:9.x"
+        llvm_tot: "ericwf/llvm:trunk-2020-09-11"
     image: llvm-buildbot-worker
     volumes:
     - /var/run/docker.sock:/var/run/docker.sock