This is an automated email from the ASF dual-hosted git repository.
bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new b0a01f1 Update clang tools version in CI (#817)
b0a01f1 is described below
commit b0a01f153b482224cbbd11814ced63fe138a3098
Author: Blake Bender <[email protected]>
AuthorDate: Wed Jun 2 18:31:22 2021 -0700
Update clang tools version in CI (#817)
* Update clang tools version to v12
- Homebrew on MacOS has gone to 12, and *yet again* it's not compatible
with the prior version, breaking CI.
* Get v12 of clang tools from 'focal' repo
Co-authored-by: Matthew Reddington <[email protected]>
---
ci/docker/clang-tools/Dockerfile | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/ci/docker/clang-tools/Dockerfile b/ci/docker/clang-tools/Dockerfile
index 6bb98d5..a84c777 100644
--- a/ci/docker/clang-tools/Dockerfile
+++ b/ci/docker/clang-tools/Dockerfile
@@ -14,13 +14,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM ubuntu:groovy
+FROM ubuntu:focal
LABEL maintainer="Apache Geode <[email protected]>"
LABEL description="Minimal image for building with clang toolset."
-ARG CLANG_VERSION=11
+ARG DEBIAN_FRONTEND=noninteractive
+ARG CLANG_VERSION=12
RUN apt-get update \
&& apt-get install -y \
+ curl \
+ software-properties-common \
+ && curl -s https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
+ && add-apt-repository "deb http://apt.llvm.org/focal/
llvm-toolchain-focal-${CLANG_VERSION} main" \
+ && apt-get update \
+ && apt-get install -y \
bash \
libssl-dev \
patch \
@@ -28,7 +35,6 @@ RUN apt-get update \
doxygen \
openjdk-8-jdk-headless \
jq \
- curl \
make \
clang-${CLANG_VERSION} \
lld-${CLANG_VERSION} \
