Skip to content

Add ccache to buildpack-deps images #16384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
marcocastignoli wants to merge 1 commit into
base: develop
Choose a base branch
from
+12 −5
Draft

Add ccache to buildpack-deps images #16384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .circleci/osx_install_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ then
brew update
brew upgrade
brew install cmake
brew install ccache
brew install wget
brew install coreutils
brew install diffutils
Expand Down
1 change: 1 addition & 0 deletions scripts/ci/docker_upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ docker run \
--rm \
--volume "${PWD}:/project" \
-u "$(id -u "${USER}"):$(id -g "${USER}")" \
-e CCACHE_DIR=/tmp/ccache \
"${IMAGE_NAME}" \
bash -c "/project/scripts/ci/${IMAGE_NAME}_test_${IMAGE_VARIANT}.sh"

Expand Down
3 changes: 2 additions & 1 deletion scripts/docker/buildpack-deps/Dockerfile.emscripten
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,15 @@
# Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
# dependencies automatically.
FROM emscripten/emsdk:3.1.19 AS base
LABEL version="21"
LABEL version="22"

ADD emscripten.jam /usr/src
RUN <<-EOF
set -ex
apt-get update
apt-get install -qqy --no-install-recommends \
lsof \
ccache \
lz4 \
python3 \
python3-pip \
Expand Down
3 changes: 2 additions & 1 deletion scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# (c) 2016-2021 solidity contributors.
#------------------------------------------------------------------------------
FROM gcr.io/oss-fuzz-base/base-builder AS base
LABEL version="12"
LABEL version="13"

ARG DEBIAN_FRONTEND=noninteractive

Expand All @@ -31,6 +31,7 @@ RUN apt-get update; \
automake \
bison \
build-essential \
ccache \
curl \
git \
jq \
Expand Down
3 changes: 2 additions & 1 deletion scripts/docker/buildpack-deps/Dockerfile.ubuntu2404
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# (c) 2016-2024 solidity contributors.
#------------------------------------------------------------------------------
FROM buildpack-deps:noble AS base
LABEL version="6"
LABEL version="7"

ARG DEBIAN_FRONTEND=noninteractive

Expand All @@ -39,6 +39,7 @@ RUN set -ex; \
apt-get install -qqy --no-install-recommends \
build-essential \
cmake \
ccache \
jq \
libboost-filesystem-dev \
libboost-program-options-dev \
Expand Down
3 changes: 2 additions & 1 deletion scripts/docker/buildpack-deps/Dockerfile.ubuntu2404.arm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# (c) 2016-2025 solidity contributors.
#------------------------------------------------------------------------------
FROM --platform=linux/arm64 buildpack-deps:noble AS base
LABEL version="2"
LABEL version="3"

ARG DEBIAN_FRONTEND=noninteractive

Expand All @@ -40,6 +40,7 @@ RUN <<-EOF
apt-get install --quiet=2 --no-install-recommends \
build-essential \
cmake \
ccache \
jq \
libboost-filesystem-dev \
libboost-program-options-dev \
Expand Down
3 changes: 2 additions & 1 deletion scripts/docker/buildpack-deps/Dockerfile.ubuntu2404.clang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# (c) 2016-2024 solidity contributors.
#------------------------------------------------------------------------------
FROM buildpack-deps:noble AS base
LABEL version="7"
LABEL version="8"

ARG DEBIAN_FRONTEND=noninteractive

Expand All @@ -40,6 +40,7 @@ RUN set -ex; \
build-essential \
clang \
cmake \
ccache \
jq \
libboost-filesystem-dev \
libboost-program-options-dev \
Expand Down