[libcxx-commits] [libcxx] 0b8585e - [libc++] Update compiler images and more docker cleanup.
Eric Fiselier via libcxx-commits
libcxx-commits at lists.llvm.org
Thu Feb 27 14:23:12 PST 2020
Author: Eric Fiselier
Date: 2020-02-27T17:22:58-05:00
New Revision: 0b8585ede40fb90baf1d44390d6531db39cc0f0f
URL: https://github.com/llvm/llvm-project/commit/0b8585ede40fb90baf1d44390d6531db39cc0f0f
DIFF: https://github.com/llvm/llvm-project/commit/0b8585ede40fb90baf1d44390d6531db39cc0f0f.diff
LOG: [libc++] Update compiler images and more docker cleanup.
Added:
libcxx/utils/docker/debian9/compilers.yml
Modified:
libcxx/utils/docker/debian9/compilers/clang.Dockerfile
libcxx/utils/docker/debian9/compilers/compiler-zoo.Dockerfile
libcxx/utils/docker/debian9/compilers/gcc.Dockerfile
libcxx/utils/docker/debian9/docker-compose.yml
libcxx/utils/docker/debian9/scripts/build_gcc_version.sh
libcxx/utils/docker/debian9/scripts/install_clang_packages.sh
Removed:
libcxx/utils/docker/debian9/compilers/compilers.yml
################################################################################
diff --git a/libcxx/utils/docker/debian9/compilers/compilers.yml b/libcxx/utils/docker/debian9/compilers.yml
similarity index 84%
rename from libcxx/utils/docker/debian9/compilers/compilers.yml
rename to libcxx/utils/docker/debian9/compilers.yml
index 51299958b438..506ca83a4d08 100644
--- a/libcxx/utils/docker/debian9/compilers/compilers.yml
+++ b/libcxx/utils/docker/debian9/compilers.yml
@@ -13,7 +13,7 @@ services:
build:
<<: *build-gcc
args:
- branch: gcc-4_8_5-release
+ branch: releases/gcc-4.8.5
install_prefix: /opt/gcc-4.8.5
cherry_pick: ec1cc0263f156f70693a62cf17b254a0029f4852
image: ericwf/compiler:gcc-4.8.5
@@ -21,37 +21,44 @@ services:
build:
<<: *build-gcc
args:
- branch: gcc-4_9_4-release
+ branch: releases/gcc-4.9.4
install_prefix: /opt/gcc-4.9.4
image: ericwf/compiler:gcc-4.9.4
gcc-5:
build:
<<: *build-gcc
args:
- branch: gcc-5_5_0-release
+ branch: releases/gcc-5.5.0
install_prefix: /opt/gcc-5
image: ericwf/compiler:gcc-5
gcc-6:
build:
<<: *build-gcc
args:
- branch: gcc-6_5_0-release
+ branch: releases/gcc-6.5.0
install_prefix: /opt/gcc-6
image: ericwf/compiler:gcc-6
gcc-7:
build:
<<: *build-gcc
args:
- branch: gcc-7_4_0-release
+ branch: releases/gcc-7.4.0
install_prefix: /opt/gcc-7
image: ericwf/compiler:gcc-7
gcc-8:
build:
<<: *build-gcc
args:
- branch: gcc-8_2_0-release
+ branch: releases/gcc-8.2.0
install_prefix: /opt/gcc-8
image: ericwf/compiler:gcc-8
+ gcc-9:
+ build:
+ <<: *build-gcc
+ args:
+ branch: releases/gcc-9.2.0
+ install_prefix: /opt/gcc-9
+ image: ericwf/compiler:gcc-9
# Add LLVM compilers
llvm-3.6:
build:
@@ -116,11 +123,19 @@ services:
branch: release/8.x
install_prefix: /opt/llvm-8
image: ericwf/compiler:llvm-8
+ llvm-9:
+ build:
+ <<: *build-clang
+ args:
+ branch: release/9.x
+ install_prefix: /opt/llvm-9
+ image: ericwf/compiler:llvm-9
gcc-tot:
build:
<<: *build-gcc
args:
branch: master
+ cache_date: feb-27
install_prefix: /opt/gcc-tot
image: ericwf/compiler:gcc-tot
llvm-tot:
@@ -128,6 +143,7 @@ services:
<<: *build-clang
args:
branch: master
+ cache_date: feb-27
install_prefix: /opt/llvm-tot
image: ericwf/compiler:llvm-tot
compiler-zoo:
@@ -143,6 +159,7 @@ services:
- gcc-6
- gcc-7
- gcc-8
+ - gcc-9
- gcc-tot
- llvm-3.6
- llvm-3.7
@@ -153,4 +170,5 @@ services:
- llvm-6
- llvm-7
- llvm-8
+ - llvm-9
- llvm-tot
diff --git a/libcxx/utils/docker/debian9/compilers/clang.Dockerfile b/libcxx/utils/docker/debian9/compilers/clang.Dockerfile
index 6ebfc6a4db68..6f12f6485a5f 100644
--- a/libcxx/utils/docker/debian9/compilers/clang.Dockerfile
+++ b/libcxx/utils/docker/debian9/compilers/clang.Dockerfile
@@ -12,6 +12,7 @@ LABEL maintainer "libc++ Developers"
ARG install_prefix
ARG branch
+ARG cache_date=stable
ADD scripts/build_llvm_version.sh /tmp/
RUN /tmp/build_llvm_version.sh --install "$install_prefix" --branch "$branch" \
diff --git a/libcxx/utils/docker/debian9/compilers/compiler-zoo.Dockerfile b/libcxx/utils/docker/debian9/compilers/compiler-zoo.Dockerfile
index b2e07613a250..cadc8b3a7bdb 100644
--- a/libcxx/utils/docker/debian9/compilers/compiler-zoo.Dockerfile
+++ b/libcxx/utils/docker/debian9/compilers/compiler-zoo.Dockerfile
@@ -19,6 +19,7 @@ COPY --from=ericwf/compiler:gcc-5 /opt/gcc-5 /opt/gcc-5
COPY --from=ericwf/compiler:gcc-6 /opt/gcc-6 /opt/gcc-6
COPY --from=ericwf/compiler:gcc-7 /opt/gcc-7 /opt/gcc-7
COPY --from=ericwf/compiler:gcc-8 /opt/gcc-8 /opt/gcc-8
+COPY --from=ericwf/compiler:gcc-9 /opt/gcc-9 /opt/gcc-9
COPY --from=ericwf/compiler:gcc-tot /opt/gcc-tot /opt/gcc-tot
COPY --from=ericwf/compiler:llvm-3.6 /opt/llvm-3.6 /opt/llvm-3.6
@@ -30,6 +31,7 @@ COPY --from=ericwf/compiler:llvm-5 /opt/llvm-5 /opt/llvm-5
COPY --from=ericwf/compiler:llvm-6 /opt/llvm-6 /opt/llvm-6
COPY --from=ericwf/compiler:llvm-7 /opt/llvm-7 /opt/llvm-7
COPY --from=ericwf/compiler:llvm-8 /opt/llvm-8 /opt/llvm-8
+COPY --from=ericwf/compiler:llvm-9 /opt/llvm-9 /opt/llvm-9
COPY --from=ericwf/compiler:llvm-tot /opt/llvm-tot /opt/llvm-tot
diff --git a/libcxx/utils/docker/debian9/compilers/gcc.Dockerfile b/libcxx/utils/docker/debian9/compilers/gcc.Dockerfile
index 507fe7029da8..adc019803d81 100644
--- a/libcxx/utils/docker/debian9/compilers/gcc.Dockerfile
+++ b/libcxx/utils/docker/debian9/compilers/gcc.Dockerfile
@@ -14,6 +14,7 @@ LABEL maintainer "libc++ Developers"
ARG branch
ARG cherry_pick=""
ARG install_prefix
+ARG cache_date=stable
ADD scripts/build_gcc_version.sh /tmp/
RUN /tmp/build_gcc_version.sh \
diff --git a/libcxx/utils/docker/debian9/docker-compose.yml b/libcxx/utils/docker/debian9/docker-compose.yml
index 60554b44a159..03b1efcdad0a 100644
--- a/libcxx/utils/docker/debian9/docker-compose.yml
+++ b/libcxx/utils/docker/debian9/docker-compose.yml
@@ -5,10 +5,10 @@ services:
context: .
dockerfile: llvm-builder-base.Dockerfile
target: llvm-builder-base
- image: ericwf/llvm-builder-base:new
+ image: ericwf/llvm-builder-base:latest
llvm-buildbot-worker:
build:
context: .
dockerfile: llvm-buildbot-worker.Dockerfile
target: llvm-buildbot-worker
- image: ericwf/llvm-buildbot-worker:new
+ image: ericwf/llvm-buildbot-worker:latest
diff --git a/libcxx/utils/docker/debian9/scripts/build_gcc_version.sh b/libcxx/utils/docker/debian9/scripts/build_gcc_version.sh
index 68aa4c67e3ea..a0ea9e62a506 100755
--- a/libcxx/utils/docker/debian9/scripts/build_gcc_version.sh
+++ b/libcxx/utils/docker/debian9/scripts/build_gcc_version.sh
@@ -79,7 +79,8 @@ git clone --branch "$GCC_BRANCH" --single-branch --depth=1 git://gcc.gnu.org/git
pushd "$GCC_SOURCE_DIR"
if [ "$CHERRY_PICK" != "" ]; then
- git fetch origin trunk --unshallow # Urg, we have to get the entire history. This will take a while.
+ git checkout -b cherry-pick-branch
+ git fetch origin master --unshallow # Urg, we have to get the entire history. This will take a while.
git cherry-pick --no-commit -X theirs "$CHERRY_PICK"
fi
./contrib/download_prerequisites
@@ -105,4 +106,4 @@ popd
# Cleanup.
rm -rf "$TMP_ROOT"
-echo "Done"
\ No newline at end of file
+echo "Done"
diff --git a/libcxx/utils/docker/debian9/scripts/install_clang_packages.sh b/libcxx/utils/docker/debian9/scripts/install_clang_packages.sh
index a3042049b9a5..785f7a73e98f 100755
--- a/libcxx/utils/docker/debian9/scripts/install_clang_packages.sh
+++ b/libcxx/utils/docker/debian9/scripts/install_clang_packages.sh
@@ -20,7 +20,7 @@ Available options:
EOF
}
-VERSION="10"
+VERSION="11"
while [[ $# -gt 0 ]]; do
case "$1" in
More information about the libcxx-commits
mailing list