mirror of https://github.com/grpc/grpc.git
[Deps ] Upgrade oldest supported clang version to clang-7 (#37572)
<!-- If you know who should review your pull request, please assign it to that person, otherwise the pull request would get assigned randomly. If your pull request is for a specific language, please add the appropriate lang label. --> Closes #37572 PiperOrigin-RevId: 670631284pull/37620/head^2
parent
c0b326baa9
commit
48cc84b435
5 changed files with 2 additions and 115 deletions
@ -1,29 +0,0 @@ |
||||
%YAML 1.2 |
||||
--- | |
||||
# Copyright 2021 gRPC authors. |
||||
# |
||||
# Licensed under the Apache License, Version 2.0 (the "License"); |
||||
# you may not use this file except in compliance with the License. |
||||
# You may obtain a copy of the License at |
||||
# |
||||
# http://www.apache.org/licenses/LICENSE-2.0 |
||||
# |
||||
# Unless required by applicable law or agreed to in writing, software |
||||
# distributed under the License is distributed on an "AS IS" BASIS, |
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
# See the License for the specific language governing permissions and |
||||
# limitations under the License. |
||||
|
||||
FROM silkeh/clang:6 |
||||
|
||||
RUN apt update && apt -y upgrade && apt install -y build-essential curl git time wget zip && apt clean |
||||
<%include file="../../git_avoid_dubious_ownership_error.include"/> |
||||
<%include file="../../run_tests_python_deps.include"/> |
||||
<%include file="../../cxx_test_deps.include"/> |
||||
<%include file="../../cxx_deps.include"/> |
||||
<%include file="../../cmake.include"/> |
||||
<%include file="../../ccache.include"/> |
||||
<%include file="../../run_tests_addons.include"/> |
||||
|
||||
# Define the default command. |
||||
CMD ["bash"] |
@ -1 +0,0 @@ |
||||
us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_6_x64:f21d78164b0720b4291bf295b6142da24183286b@sha256:eebbaf353522d523ec9a7acb34bb3ae194e22ea7493c85c01437719e30da205d |
@ -1,83 +0,0 @@ |
||||
# Copyright 2021 gRPC authors. |
||||
# |
||||
# Licensed under the Apache License, Version 2.0 (the "License"); |
||||
# you may not use this file except in compliance with the License. |
||||
# You may obtain a copy of the License at |
||||
# |
||||
# http://www.apache.org/licenses/LICENSE-2.0 |
||||
# |
||||
# Unless required by applicable law or agreed to in writing, software |
||||
# distributed under the License is distributed on an "AS IS" BASIS, |
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
# See the License for the specific language governing permissions and |
||||
# limitations under the License. |
||||
|
||||
FROM silkeh/clang:6 |
||||
|
||||
RUN apt update && apt -y upgrade && apt install -y build-essential curl git time wget zip && apt clean |
||||
#================= |
||||
# Setup git to access working directory across docker boundary. |
||||
# This avoids the "fatal: detected dubious ownership in repository XYZ" |
||||
# git error. |
||||
|
||||
RUN git config --global --add safe.directory '*' |
||||
RUN git config --global protocol.file.allow always |
||||
|
||||
#==================== |
||||
# run_tests.py python dependencies |
||||
|
||||
# Basic python dependencies to be able to run tools/run_tests python scripts |
||||
# These dependencies are not sufficient to build gRPC Python, gRPC Python |
||||
# deps are defined elsewhere (e.g. python_deps.include) |
||||
RUN apt-get update && apt-get install -y \ |
||||
python3 \ |
||||
python3-pip \ |
||||
python3-setuptools \ |
||||
python3-yaml \ |
||||
&& apt-get clean |
||||
|
||||
# use pinned version of pip to avoid sudden breakages |
||||
RUN python3 -m pip install --upgrade pip==19.3.1 |
||||
|
||||
# TODO(jtattermusch): currently six is needed for tools/run_tests scripts |
||||
# but since our python2 usage is deprecated, we should get rid of it. |
||||
RUN python3 -m pip install six==1.16.0 |
||||
|
||||
# Google Cloud Platform API libraries |
||||
# These are needed for uploading test results to BigQuery (e.g. by tools/run_tests scripts) |
||||
RUN python3 -m pip install --upgrade google-auth==1.23.0 google-api-python-client==1.12.8 oauth2client==4.1.0 |
||||
|
||||
|
||||
# Some cxx tests depend on the twisted package |
||||
RUN python3 -m pip install twisted |
||||
|
||||
#================= |
||||
# C++ dependencies |
||||
RUN apt-get update && apt-get -y install libc++-dev clang && apt-get clean |
||||
|
||||
#================= |
||||
# Install cmake |
||||
# Note that this step should be only used for distributions that have new enough cmake to satisfy gRPC's cmake version requirement. |
||||
|
||||
RUN apt-get update && apt-get install -y cmake && apt-get clean |
||||
|
||||
#================= |
||||
# Install ccache |
||||
|
||||
# Install ccache from source since ccache 3.x packaged with most linux distributions |
||||
# does not support Redis backend for caching. |
||||
RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/download/v4.7.5/ccache-4.7.5.tar.gz \ |
||||
&& tar -zxf ccache.tar.gz \ |
||||
&& cd ccache-4.7.5 \ |
||||
&& mkdir build && cd build \ |
||||
&& cmake -DCMAKE_BUILD_TYPE=Release -DZSTD_FROM_INTERNET=ON -DHIREDIS_FROM_INTERNET=ON .. \ |
||||
&& make -j4 && make install \ |
||||
&& cd ../.. \ |
||||
&& rm -rf ccache-4.7.5 ccache.tar.gz |
||||
|
||||
|
||||
RUN mkdir /var/local/jenkins |
||||
|
||||
|
||||
# Define the default command. |
||||
CMD ["bash"] |
Loading…
Reference in new issue