Merge "ci: more fixes form fallout of redone CI"
diff --git a/gn/standalone/toolchain/linux_find_llvm.py b/gn/standalone/toolchain/linux_find_llvm.py
index 3a957fe..85d6c93 100644
--- a/gn/standalone/toolchain/linux_find_llvm.py
+++ b/gn/standalone/toolchain/linux_find_llvm.py
@@ -19,7 +19,7 @@
def main():
devnull = open(os.devnull, 'w')
- for clang in ('clang', 'clang-3.8', 'clang-3.5'):
+ for clang in ('clang', 'clang-3.8', 'clang-3.5', 'clang-8'):
if subprocess.call(['which', clang], stdout=devnull, stderr=devnull) != 0:
continue
res = subprocess.check_output([clang, '-print-search-dirs']).decode("utf-8")
diff --git a/infra/ci/sandbox/Dockerfile b/infra/ci/sandbox/Dockerfile
index 5f71803..c687830 100644
--- a/infra/ci/sandbox/Dockerfile
+++ b/infra/ci/sandbox/Dockerfile
@@ -20,12 +20,19 @@
RUN set -ex; \
export DEBIAN_FRONTEND=noninteractive; \
+ echo deb http://deb.debian.org/debian buster-backports main > \
+ /etc/apt/sources.list.d/backports.list; \
apt-get update; \
apt-get -y install python git curl sudo lz4 tar ccache tini libpulse0 \
libgl1 libxml2 libc6-dev-i386 libtinfo5 gnupg2 \
pkg-config zip g++ zlib1g-dev unzip python3 \
python-distutils-extra python3-distutils; \
- apt-get -y install gcc-7 g++-7 clang; \
+ apt-get -y install gcc-7 g++-7; \
+ gcc-7 --version; \
+ g++-7 --version; \
+ apt-get -y -t buster-backports install clang-8; \
+ clang-8 --version; \
+ clang++-8 --version; \
curl https://bootstrap.pypa.io/get-pip.py | python -; \
pip install --quiet protobuf; \
curl https://bootstrap.pypa.io/get-pip.py | python3 -; \
diff --git a/infra/ci/worker/perf_metrics_uploader.py b/infra/ci/worker/perf_metrics_uploader.py
index 9f2dd7a..37c22db 100755
--- a/infra/ci/worker/perf_metrics_uploader.py
+++ b/infra/ci/worker/perf_metrics_uploader.py
@@ -53,7 +53,8 @@
def sha1(obj):
hasher = hashlib.sha1()
- hasher.update(json.dumps(obj, sort_keys=True, separators=(',', ':')))
+ hasher.update(
+ json.dumps(obj, sort_keys=True, separators=(',', ':')).encode('utf-8'))
return hasher.hexdigest()
