Author: Louis Dionne Date: 2020-12-16T17:01:21-05:00 New Revision: 46ae36045257e2d1f60ce6178d99a77f45160fbc
URL: https://github.com/llvm/llvm-project/commit/46ae36045257e2d1f60ce6178d99a77f45160fbc DIFF: https://github.com/llvm/llvm-project/commit/46ae36045257e2d1f60ce6178d99a77f45160fbc.diff LOG: [libc++] Fix CI Dockerfile Installing clang-format-11 doesn't seem to work if it's done before we've installed LLVM. I must admit I didn't try to get to the bottom of the issue, since installing it after seems to work. Added: Modified: libcxx/utils/ci/Dockerfile Removed: ################################################################################ diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile index c9fe0fd9dd24..fea46d8cd81e 100644 --- a/libcxx/utils/ci/Dockerfile +++ b/libcxx/utils/ci/Dockerfile @@ -45,10 +45,8 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y bash curl # Install various tools used by the build or the test suite -RUN apt-get update && apt-get install -y ninja-build python3 python3-sphinx python3-distutils git gdb clang-format-11 +RUN apt-get update && apt-get install -y ninja-build python3 python3-sphinx python3-distutils git gdb RUN apt-get update && apt-get install -y libc6-dev-i386 # Required to cross-compile to 32 bits -# Make a symbolic link to git-clang-format (pointing to git-clang-format-<version>), if it doesn't exist. -RUN which git-clang-format || $(cd /usr/bin/ && ln -s $(ls git-clang-format-* | sort -rV | head -n 1) git-clang-format) # Install the most recently released LLVM RUN apt-get update && apt-get install -y lsb-release wget software-properties-common @@ -56,6 +54,10 @@ RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" RUN ln -s $(find /usr/bin -regex '^.+/clang\+\+-[0-9.]+$') /usr/bin/clang++ RUN ln -s $(find /usr/bin -regex '^.+/clang-[0-9.]+$') /usr/bin/clang +RUN apt-get update && apt-get install -y clang-format-11 +# Make a symbolic link to git-clang-format (pointing to git-clang-format-<version>), if it doesn't exist. +RUN which git-clang-format || $(cd /usr/bin/ && ln -s $(ls git-clang-format-* | sort -rV | head -n 1) git-clang-format) + # Install a recent GCC RUN add-apt-repository ppa:ubuntu-toolchain-r/test RUN apt-get update && apt install -y gcc-10 g++-10 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
