aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYvan Roux <yvan.roux@linaro.org>2018-05-29 11:22:41 +0200
committerYvan Roux <yvan.roux@linaro.org>2018-05-29 11:23:05 +0200
commit8abda302b34d21071ad8be1e6e36b86294fb71dd (patch)
treebf9453180ad863b24ed4b0cc409326d0ddbd0d74
parent6bece8af3df83eac0dd241c948b8f672b38e6fd9 (diff)
tcwg-llvmbot: Update Clang to 6.0.0 version.
Change-Id: Ied812cda47eb4a1cdadc5e41211aad5fd704e0b6
-rw-r--r--tcwg-base/tcwg-llvmbot/Dockerfile.in6
-rwxr-xr-xtcwg-base/tcwg-llvmbot/run.sh6
2 files changed, 6 insertions, 6 deletions
diff --git a/tcwg-base/tcwg-llvmbot/Dockerfile.in b/tcwg-base/tcwg-llvmbot/Dockerfile.in
index 1d0d65d4..24233ed9 100644
--- a/tcwg-base/tcwg-llvmbot/Dockerfile.in
+++ b/tcwg-base/tcwg-llvmbot/Dockerfile.in
@@ -32,12 +32,12 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
# Add current clang for libcxx bots.
RUN \
#if ARCH_arm64
- clang_ver=clang+llvm-5.0.1-aarch64-linux-gnu \
+ clang_ver=clang+llvm-6.0.0-aarch64-linux-gnu \
#else /* ARCH_armhf */
- clang_ver=clang+llvm-5.0.1-armv7a-linux-gnueabihf \
+ clang_ver=clang+llvm-6.0.0-armv7a-linux-gnueabihf \
#endif
&& cd /usr/local \
- && wget --progress=dot:giga http://releases.llvm.org/5.0.1/$clang_ver.tar.xz \
+ && wget --progress=dot:giga http://releases.llvm.org/6.0.0/$clang_ver.tar.xz \
&& tar xf $clang_ver.tar.xz \
&& rm $clang_ver.tar.xz
diff --git a/tcwg-base/tcwg-llvmbot/run.sh b/tcwg-base/tcwg-llvmbot/run.sh
index e22b1fda..3aa5cb2a 100755
--- a/tcwg-base/tcwg-llvmbot/run.sh
+++ b/tcwg-base/tcwg-llvmbot/run.sh
@@ -25,10 +25,10 @@ fi
case "$(uname -m)" in
aarch64)
- clang_ver=clang+llvm-5.0.1-aarch64-linux-gnu
+ clang_ver=clang+llvm-6.0.0-aarch64-linux-gnu
;;
*)
- clang_ver=clang+llvm-5.0.1-armv7a-linux-gnueabihf
+ clang_ver=clang+llvm-6.0.0-armv7a-linux-gnueabihf
;;
esac
@@ -37,7 +37,7 @@ if bare_metal_bot_p "$2"; then
# bots.
(
cd /usr/local
- wget -c --progress=dot:giga http://releases.llvm.org/5.0.1/$clang_ver.tar.xz
+ wget -c --progress=dot:giga http://releases.llvm.org/6.0.0/$clang_ver.tar.xz
tar xf $clang_ver.tar.xz
)
fi