From b3e338fd5f861a350163a13f02afa118c3620489 Mon Sep 17 00:00:00 2001 From: Piotr Sikora Date: Fri, 8 Feb 2019 13:01:23 -0800 Subject: [PATCH] Update software in the build image used by CircleCI. (#2110) Signed-off-by: Piotr Sikora --- .circleci/Dockerfile | 11 ++++++----- .circleci/Makefile | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile index c19d2ba60b0..8b89f92fe3d 100644 --- a/.circleci/Dockerfile +++ b/.circleci/Dockerfile @@ -10,24 +10,25 @@ FROM circleci/openjdk:latest # clang is used for TSAN and ASAN tests RUN sudo sh -c 'curl http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -' -RUN sudo sh -c 'echo "deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch-6.0 main" > /etc/apt/sources.list.d/llvm.list' +RUN sudo sh -c 'echo "deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch-7 main" > /etc/apt/sources.list.d/llvm.list' RUN sudo apt-get update && \ sudo apt-get -y install \ wget software-properties-common make cmake python python-pip pkg-config \ zlib1g-dev bash-completion bc libtool automake zip time g++-6 gcc-6 \ - clang-6.0 clang-format-6.0 rsync ninja-build + clang-7 clang-format-7 clang-tidy-7 lld-7 libc++-7-dev libc++abi-7-dev \ + rsync ninja-build # ~100M, depends on g++, zlib1g-dev, bash-completions -RUN curl -Lo /tmp/bazel.deb https://github.com/bazelbuild/bazel/releases/download/0.18.0/bazel_0.18.0-linux-x86_64.deb && \ +RUN curl -Lo /tmp/bazel.deb https://github.com/bazelbuild/bazel/releases/download/0.22.0/bazel_0.22.0-linux-x86_64.deb && \ sudo dpkg -i /tmp/bazel.deb && rm /tmp/bazel.deb # Instead of "apt-get -y install golang" RUN cd /tmp && \ - wget https://redirector.gvt1.com/edgedl/go/go1.10.3.linux-amd64.tar.gz && \ + wget https://redirector.gvt1.com/edgedl/go/go1.11.5.linux-amd64.tar.gz && \ sudo rm -rf /usr/local/go && \ - sudo tar -C /usr/local -xzf go1.10.3.linux-amd64.tar.gz && \ + sudo tar -C /usr/local -xzf go1.11.5.linux-amd64.tar.gz && \ sudo chown -R circleci /usr/local/go && \ sudo ln -s /usr/local/go/bin/go /usr/local/bin diff --git a/.circleci/Makefile b/.circleci/Makefile index b0232c3f9e9..eb109596c9e 100644 --- a/.circleci/Makefile +++ b/.circleci/Makefile @@ -2,7 +2,7 @@ HUB ?= PROJECT ?= istio # Using same naming convention as istio/istio -VERSION ?= go1.10-bazel0.18-clang6.0 +VERSION ?= go1.11-bazel0.22-clang7 IMG ?= ci # Build a local image, can be used for testing with circleci command line.