Skip to content

Commit

Permalink
Add required dependencies to set up Azure ccache in workflows (#7)
Browse files Browse the repository at this point in the history
Signed-off-by: Elias Joseph <[email protected]>
  • Loading branch information
Eliasj42 authored Sep 5, 2024
1 parent e1b369e commit e720720
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 2 deletions.
13 changes: 12 additions & 1 deletion dockerfiles/cpubuilder_ubuntu_jammy_ghr_x86_64.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN apt install -y python3.11-dev python3.11-venv python3-pip && \
RUN apt install -y \
clang-14 lld-14 \
gcc-9 g++-9 \
ccache ninja-build libssl-dev libxml2-dev libcapstone-dev libtbb-dev \
ninja-build libssl-dev libxml2-dev libcapstone-dev libtbb-dev \
libzstd-dev llvm-dev pkg-config
# Recent compiler tools for build configurations like ASan/TSan.
# * See https://apt.llvm.org/ for context on the apt commands.
Expand All @@ -21,9 +21,20 @@ RUN echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_VERSION} ma
curl https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/llvm-snapshot.gpg && \
apt update && \
apt install -y clang-${LLVM_VERSION} lld-${LLVM_VERSION}
# Virtual file system adapter for Azure Blob storage, used for remote cache.
RUN curl -sSL -O https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb
RUN dpkg -i packages-microsoft-prod.deb
RUN rm packages-microsoft-prod.deb
RUN apt-get update && \
apt-get install -y fuse3 blobfuse2
# Cleanup.
RUN apt clean && rm -rf /var/lib/apt/lists/*

######## CCache ########
WORKDIR /install-ccache
COPY build_tools/install_ccache.sh ./
RUN ./install_ccache.sh "4.10.2" && rm -rf /install-ccache

######## CMake ########
WORKDIR /install-cmake
ENV CMAKE_VERSION="3.23.2"
Expand Down
13 changes: 12 additions & 1 deletion dockerfiles/cpubuilder_ubuntu_jammy_x86_64.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN apt install -y python3.11-dev python3.11-venv python3-pip && \
RUN apt install -y \
clang-14 lld-14 \
gcc-9 g++-9 \
ccache ninja-build libssl-dev libxml2-dev libcapstone-dev libtbb-dev \
ninja-build libssl-dev libxml2-dev libcapstone-dev libtbb-dev \
libzstd-dev llvm-dev pkg-config
# Recent compiler tools for build configurations like ASan/TSan.
# * See https://apt.llvm.org/ for context on the apt commands.
Expand All @@ -21,9 +21,20 @@ RUN echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_VERSION} ma
curl https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/llvm-snapshot.gpg && \
apt update && \
apt install -y clang-${LLVM_VERSION} lld-${LLVM_VERSION}
# Virtual file system adapter for Azure Blob storage, used for remote cache.
RUN curl -sSL -O https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb
RUN dpkg -i packages-microsoft-prod.deb
RUN rm packages-microsoft-prod.deb
RUN apt-get update && \
apt-get install -y fuse3 blobfuse2
# Cleanup.
RUN apt clean && rm -rf /var/lib/apt/lists/*

######## CCache ########
WORKDIR /install-ccache
COPY build_tools/install_ccache.sh ./
RUN ./install_ccache.sh "4.10.2" && rm -rf /install-ccache

######## CMake ########
WORKDIR /install-cmake
ENV CMAKE_VERSION="3.23.2"
Expand Down

0 comments on commit e720720

Please sign in to comment.