From b5f5bf73304b0038eb5629128abd69b7d478f876 Mon Sep 17 00:00:00 2001 From: fanquake Date: Tue, 11 Feb 2020 16:10:34 +0800 Subject: [PATCH] partial merge #18104: build: Skip i686 build by default in guix and gitian fae9084ac5b10f94bdee54853d307838c4254e9c build: Skip i686 build by default in guix and gitian (MarcoFalke) fa55a2554c2661b8f2a759044d5ac85c9979d9ca depends: Remove reference to win32 (MarcoFalke) Pull request description: Closes #17504 Now that we no longer provide downloads for i686 on our website (https://bitcoincore.org/en/download/), there is no need to build them by default. i686 can still be built in depends (tested by ci/travis) and in guix/gitian by setting the appropriate `HOSTS`. ACKs for top commit: practicalswift: ACK fae9084ac5b10f94bdee54853d307838c4254e9c -- patch looks correct dongcarl: ACK fae9084ac5b10f94bdee54853d307838c4254e9c patch looks correct laanwj: Code review ACK fae9084ac5b10f94bdee54853d307838c4254e9c hebasto: ACK fae9084ac5b10f94bdee54853d307838c4254e9c, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: b000c19a2cd2a596a52028fa298c4022c24cfdfc1bdb3795a90916d0a00a32e4dd22278db93790b6a11724e08ea8451f4f05c77bc40d1664518e11a8c82d6e29 --- contrib/gitian-descriptors/gitian-linux.yml | 2 +- doc/release-process.md | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 3eca24f94e..28f324f2eb 100755 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -42,7 +42,7 @@ script: | set -e -o pipefail WRAP_DIR=$HOME/wrapped - HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu" + HOSTS="x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu" CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests --enable-crash-hooks" FAKETIME_HOST_PROGS="gcc g++" FAKETIME_PROGS="date ar ranlib nm" diff --git a/doc/release-process.md b/doc/release-process.md index 3bb9014fbf..6257f47a1f 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -236,7 +236,6 @@ The list of files should be: ``` dash-${VERSION}-aarch64-linux-gnu.tar.gz dash-${VERSION}-arm-linux-gnueabihf.tar.gz -dash-${VERSION}-i686-pc-linux-gnu.tar.gz dash-${VERSION}-riscv64-linux-gnu.tar.gz dash-${VERSION}-x86_64-linux-gnu.tar.gz dash-${VERSION}-osx64.tar.gz