From b8685bcf241833ee0e2c7511420b57c74a797f3b Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 31 Aug 2021 05:19:09 +0100 Subject: [PATCH 1/2] gitian: omit ccache from gitian builds It's just wasted overhead since the build VMs are always deleted and recreated fresh for each run. --- contrib/depends/packages/packages.mk | 3 +++ contrib/gitian/gitian-android.yml | 2 +- contrib/gitian/gitian-freebsd.yml | 2 +- contrib/gitian/gitian-linux.yml | 2 +- contrib/gitian/gitian-osx.yml | 1 + 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 From f5086126ca5bea3bee92545b50ae906673293bd9 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 1 Sep 2021 11:30:41 +0100 Subject: [PATCH 2/2] gitian: cleanup more unused packages These appear to be leftovers inherited from Bitcoin's builder --- contrib/depends/packages/packages.mk | 6 +++--- contrib/gitian/gitian-android.yml | 5 ----- contrib/gitian/gitian-freebsd.yml | 5 ----- contrib/gitian/gitian-linux.yml | 5 ----- contrib/gitian/gitian-win.yml | 1 - 5 files changed, 3 insertions(+), 19 deletions(-) diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk index b683f4363..978e056b4 100644 --- a/contrib/depends/packages/packages.mk +++ b/contrib/depends/packages/packages.mk @@ -11,8 +11,8 @@ hardware_native_packages := native_protobuf android_native_packages = android_ndk android_packages = ncurses readline sodium -darwin_native_packages = native_biplist native_ds_store native_mac_alias $(hardware_native_packages) -darwin_packages = sodium ncurses readline $(hardware_packages) +darwin_native_packages = $(hardware_native_packages) +darwin_packages = ncurses readline sodium $(hardware_packages) # not really native... freebsd_native_packages = freebsd_base @@ -34,6 +34,6 @@ mingw32_packages = icu4c sodium $(hardware_packages) mingw32_native_packages = $(hardware_native_packages) ifneq ($(build_os),darwin) -darwin_native_packages += native_cctools native_cdrkit native_libdmg-hfsplus +darwin_native_packages += native_cctools endif diff --git a/contrib/gitian/gitian-android.yml b/contrib/gitian/gitian-android.yml index 7953e6f38..d988bd4c8 100644 --- a/contrib/gitian/gitian-android.yml +++ b/contrib/gitian/gitian-android.yml @@ -24,11 +24,6 @@ packages: - "ca-certificates" - "python" - "cmake" -- "protobuf-compiler" -- "libdbus-1-dev" -- "libharfbuzz-dev" -- "libprotobuf-dev" -- "python3-zmq" - "unzip" remotes: - "url": "https://github.com/monero-project/monero.git" diff --git a/contrib/gitian/gitian-freebsd.yml b/contrib/gitian/gitian-freebsd.yml index 3c1adbbe5..bf23a05ff 100644 --- a/contrib/gitian/gitian-freebsd.yml +++ b/contrib/gitian/gitian-freebsd.yml @@ -25,11 +25,6 @@ packages: - "ca-certificates" - "python" - "cmake" -- "protobuf-compiler" -- "libdbus-1-dev" -- "libharfbuzz-dev" -- "libprotobuf-dev" -- "python3-zmq" remotes: - "url": "https://github.com/monero-project/monero.git" "dir": "monero" diff --git a/contrib/gitian/gitian-linux.yml b/contrib/gitian/gitian-linux.yml index b52da84a2..7e75e489f 100644 --- a/contrib/gitian/gitian-linux.yml +++ b/contrib/gitian/gitian-linux.yml @@ -36,11 +36,6 @@ packages: - "ca-certificates" - "python" - "cmake" -- "protobuf-compiler" -- "libdbus-1-dev" -- "libharfbuzz-dev" -- "libprotobuf-dev" -- "python3-zmq" remotes: - "url": "https://github.com/monero-project/monero.git" "dir": "monero" diff --git a/contrib/gitian/gitian-win.yml b/contrib/gitian/gitian-win.yml index 7bb90494e..ee7920b6c 100644 --- a/contrib/gitian/gitian-win.yml +++ b/contrib/gitian/gitian-win.yml @@ -20,7 +20,6 @@ packages: - "zip" - "ca-certificates" - "python" -- "rename" - "cmake" alternatives: -