diff options
| author | Howard Chu <hyc@symas.com> | 2021-08-31 05:19:09 +0100 |
|---|---|---|
| committer | Howard Chu <hyc@symas.com> | 2021-09-27 17:14:03 +0100 |
| commit | 4ea7832ea7a4fc23eca69508fed4e7eb68069a4e (patch) | |
| tree | b5555011b30c625099a7aa02a44a78944dfd8318 | |
| parent | Merge pull request #7893 (diff) | |
| download | monero-4ea7832ea7a4fc23eca69508fed4e7eb68069a4e.tar.xz | |
gitian: omit ccache from gitian builds
It's just wasted overhead since the build VMs are always deleted
and recreated fresh for each run.
| -rw-r--r-- | contrib/depends/packages/packages.mk | 3 | ||||
| -rw-r--r-- | contrib/gitian/gitian-android.yml | 2 | ||||
| -rw-r--r-- | contrib/gitian/gitian-freebsd.yml | 2 | ||||
| -rw-r--r-- | contrib/gitian/gitian-linux.yml | 2 | ||||
| -rw-r--r-- | contrib/gitian/gitian-osx.yml | 1 | ||||
| -rw-r--r-- | contrib/gitian/gitian-win.yml | 1 |
6 files changed, 8 insertions, 3 deletions
diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk index 95b23a37e..b683f4363 100644 --- a/contrib/depends/packages/packages.mk +++ b/contrib/depends/packages/packages.mk @@ -1,6 +1,9 @@ packages:=boost openssl zeromq libiconv +# ccache is useless in gitian builds +ifneq ($(GITIAN),1) native_packages := native_ccache +endif hardware_packages := hidapi protobuf libusb hardware_native_packages := native_protobuf diff --git a/contrib/gitian/gitian-android.yml b/contrib/gitian/gitian-android.yml index b8eaa8af9..7953e6f38 100644 --- a/contrib/gitian/gitian-android.yml +++ b/contrib/gitian/gitian-android.yml @@ -24,7 +24,6 @@ packages: - "ca-certificates" - "python" - "cmake" -- "ccache" - "protobuf-compiler" - "libdbus-1-dev" - "libharfbuzz-dev" @@ -52,6 +51,7 @@ script: | if test -n "$GBUILD_CACHE_ENABLED"; then export SOURCES_PATH=${GBUILD_COMMON_CACHE} export BASE_CACHE=${GBUILD_PACKAGE_CACHE} + export GITIAN=1 mkdir -p ${BASE_CACHE} ${SOURCES_PATH} fi diff --git a/contrib/gitian/gitian-freebsd.yml b/contrib/gitian/gitian-freebsd.yml index 36b81c641..3c1adbbe5 100644 --- a/contrib/gitian/gitian-freebsd.yml +++ b/contrib/gitian/gitian-freebsd.yml @@ -25,7 +25,6 @@ packages: - "ca-certificates" - "python" - "cmake" -- "ccache" - "protobuf-compiler" - "libdbus-1-dev" - "libharfbuzz-dev" @@ -52,6 +51,7 @@ script: | if test -n "$GBUILD_CACHE_ENABLED"; then export SOURCES_PATH=${GBUILD_COMMON_CACHE} export BASE_CACHE=${GBUILD_PACKAGE_CACHE} + export GITIAN=1 mkdir -p ${BASE_CACHE} ${SOURCES_PATH} fi diff --git a/contrib/gitian/gitian-linux.yml b/contrib/gitian/gitian-linux.yml index 0aac983cc..b52da84a2 100644 --- a/contrib/gitian/gitian-linux.yml +++ b/contrib/gitian/gitian-linux.yml @@ -36,7 +36,6 @@ packages: - "ca-certificates" - "python" - "cmake" -- "ccache" - "protobuf-compiler" - "libdbus-1-dev" - "libharfbuzz-dev" @@ -63,6 +62,7 @@ script: | if test -n "$GBUILD_CACHE_ENABLED"; then export SOURCES_PATH=${GBUILD_COMMON_CACHE} export BASE_CACHE=${GBUILD_PACKAGE_CACHE} + export GITIAN=1 mkdir -p ${BASE_CACHE} ${SOURCES_PATH} fi diff --git a/contrib/gitian/gitian-osx.yml b/contrib/gitian/gitian-osx.yml index 9889ca45f..fdfe5bd22 100644 --- a/contrib/gitian/gitian-osx.yml +++ b/contrib/gitian/gitian-osx.yml @@ -41,6 +41,7 @@ script: | if test -n "$GBUILD_CACHE_ENABLED"; then export SOURCES_PATH=${GBUILD_COMMON_CACHE} export BASE_CACHE=${GBUILD_PACKAGE_CACHE} + export GITIAN=1 mkdir -p ${BASE_CACHE} ${SOURCES_PATH} fi diff --git a/contrib/gitian/gitian-win.yml b/contrib/gitian/gitian-win.yml index c53086144..7bb90494e 100644 --- a/contrib/gitian/gitian-win.yml +++ b/contrib/gitian/gitian-win.yml @@ -54,6 +54,7 @@ script: | if test -n "$GBUILD_CACHE_ENABLED"; then export SOURCES_PATH=${GBUILD_COMMON_CACHE} export BASE_CACHE=${GBUILD_PACKAGE_CACHE} + export GITIAN=1 mkdir -p ${BASE_CACHE} ${SOURCES_PATH} fi |