cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8359 from ethereum/fix-8358

Browse Source 
[Docker] Upgrade libprotobuf-mutator inside clang docker image
This commit is contained in:
chriseth 2020-02-24 16:06:22 +01:00 committed by GitHub
commit 6697c07db7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -15,7 +15,7 @@ parameters:
default: "4" default: "4"
ubuntu-1904-clang-docker-image-rev: ubuntu-1904-clang-docker-image-rev:
type: string type: string
default: "4" default: "5"
defaults: defaults:

5
.circleci/docker/Dockerfile.clang.ubuntu1904
View File

@ -51,9 +51,10 @@ ENV CC clang
ENV CXX clang++ ENV CXX clang++
# Boost # Boost
RUN git clone --recursive -b boost-1.69.0 https://github.com/boostorg/boost.git \ RUN git clone -b boost-1.69.0 https://github.com/boostorg/boost.git \
/usr/src/boost; \ /usr/src/boost; \
cd /usr/src/boost; \ cd /usr/src/boost; \
git submodule update --init --recursive; \
./bootstrap.sh --with-toolset=clang --prefix=/usr; \ ./bootstrap.sh --with-toolset=clang --prefix=/usr; \
./b2 toolset=clang headers; \ ./b2 toolset=clang headers; \
./b2 toolset=clang variant=release \ ./b2 toolset=clang variant=release \
@ -76,7 +77,7 @@ RUN set -ex; \
git clone https://github.com/google/libprotobuf-mutator.git \ git clone https://github.com/google/libprotobuf-mutator.git \
/usr/src/libprotobuf-mutator; \ /usr/src/libprotobuf-mutator; \
cd /usr/src/libprotobuf-mutator; \ cd /usr/src/libprotobuf-mutator; \
git checkout d1fe8a7d8ae18f3d454f055eba5213c291986f21; \ git checkout 3521f47a2828da9ace403e4ecc4aece1a84feb36; \
mkdir build; \ mkdir build; \
cd build; \ cd build; \
cmake .. -GNinja -DLIB_PROTO_MUTATOR_DOWNLOAD_PROTOBUF=ON \ cmake .. -GNinja -DLIB_PROTO_MUTATOR_DOWNLOAD_PROTOBUF=ON \