Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-01-14 03:45:33 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

attempt to unbreak build bots

Browse Source 
llvm-svn: 359404
This commit is contained in:
Eric Fiselier 2019-04-28 16:42:49 +00:00
parent 2f5f9a159b
commit 290a3a3648
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libcxx/utils/docker/debian9/Dockerfile
View File

@ -36,8 +36,10 @@ RUN apt-get update && \
software-properties-common \ software-properties-common \
gnupg \ gnupg \
apt-transport-https \ apt-transport-https \
sudo \
systemd \ systemd \
sysvinit-utils && \ sysvinit-utils \
systemd-sysv && \
update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.gold" 20 && \ update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.gold" 20 && \
update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10 && \ update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10 && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
@ -166,7 +168,6 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
bash-completion \ bash-completion \
vim \ vim \
systemd-sysv \
buildbot-slave \ buildbot-slave \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

7
libcxx/utils/docker/scripts/run_buildbot_new.sh
View File

@ -15,6 +15,8 @@ popd
apt-get update -y apt-get update -y
apt-get upgrade -y apt-get upgrade -y
apt-get install sudo -y
# FIXME(EricWF): Remove this hack. It's only in place to temporarily fix linking libclang_rt from the # FIXME(EricWF): Remove this hack. It's only in place to temporarily fix linking libclang_rt from the
# debian packages. # debian packages.
# WARNING: If you're not a buildbot, DO NOT RUN! # WARNING: If you're not a buildbot, DO NOT RUN!
@ -67,7 +69,7 @@ function try_start_builder {
local BOT_DIR=$BOT_ROOT/b$N local BOT_DIR=$BOT_ROOT/b$N
local BOT_NAME=$BOT_ROOT_NAME$N local BOT_NAME=$BOT_ROOT_NAME$N
setup_numbered_bot $BOT_NAME $BOT_DIR setup_numbered_bot $BOT_NAME $BOT_DIR
/usr/bin/buildslave start $BOT_DIR sudo -u buildbot /usr/bin/buildslave start $BOT_DIR
sleep 30 sleep 30
cat /tmp/twistd.log cat /tmp/twistd.log
@ -82,8 +84,7 @@ function try_start_builder {
exit 1 exit 1
} }
for N in `shuf -i 1-5`
for N in 1 2 3 4 5
do do
if try_start_builder $N; then if try_start_builder $N; then
break break