Skip to content

Commit

Permalink
Update clang-format CI build (#5930)
Browse files Browse the repository at this point in the history
* Let clang-format build run on any node that has docker

* Use ubuntu:18.04 as the base image for the clang-format CI build

* Fixup LLVm download URL

* Install build-essential (need gpg and xz)
  • Loading branch information
dalg24 authored Mar 1, 2023
1 parent 8b80bd0 commit 5f8d0e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .jenkins
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pipeline {
dockerfile {
filename 'Dockerfile.clang'
dir 'scripts/docker'
label 'nvidia-docker || docker'
label 'nvidia-docker || rocm-docker || docker'
args '-v /tmp/ccache.kokkos:/tmp/ccache'
}
}
Expand Down
5 changes: 3 additions & 2 deletions scripts/docker/Dockerfile.clang
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
FROM nvidia/cuda:9.2-devel
FROM ubuntu:18.04

RUN apt-get update && apt-get install -y \
bc \
git \
build-essential \
wget \
ccache \
&& \
Expand Down Expand Up @@ -34,7 +35,7 @@ ENV PATH=${CMAKE_DIR}/bin:$PATH

ENV LLVM_DIR=/opt/llvm
RUN LLVM_VERSION=8.0.0 && \
LLVM_URL=http://releases.llvm.org/${LLVM_VERSION}/clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-16.04.tar.xz && \
LLVM_URL=https://releases.llvm.org/${LLVM_VERSION}/clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-18.04.tar.xz && \
LLVM_ARCHIVE=llvm-${LLVM_VERSION}.tar.xz && \
SCRATCH_DIR=/scratch && mkdir -p ${SCRATCH_DIR} && cd ${SCRATCH_DIR} && \
wget --quiet ${LLVM_URL} --output-document=${LLVM_ARCHIVE} && \
Expand Down

0 comments on commit 5f8d0e3

Please sign in to comment.