Skip to content
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.

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

build: Skip i686 build by default in guix and gitian #18104

Merged
merged 2 commits into from Feb 11, 2020

Conversation

@MarcoFalke
Copy link
Member

MarcoFalke commented Feb 9, 2020

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.

MarcoFalke added 2 commits Feb 9, 2020
win32 is no longer mentioned in doc/build-windows.md
@MarcoFalke MarcoFalke force-pushed the MarcoFalke:2002-i686NoBuildByDefault branch from fa0902e to fae9084 Feb 9, 2020
@DrahtBot

This comment has been minimized.

Copy link
Contributor

DrahtBot commented Feb 10, 2020

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #17595 (guix: Enable building for x86_64-w64-mingw32 target by dongcarl)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@laanwj

This comment has been minimized.

Copy link
Member

laanwj commented Feb 10, 2020

Code review ACK fae9084
Travis fail is the usual s390 fail.

Copy link
Member

hebasto left a comment

ACK fae9084, I have reviewed the code and it looks OK, I agree it can be merged.

@practicalswift

This comment has been minimized.

Copy link
Member

practicalswift commented Feb 10, 2020

ACK fae9084 -- patch looks correct

@dongcarl

This comment has been minimized.

Copy link
Contributor

dongcarl commented Feb 10, 2020

Nice! Could probably also remove

(make-bitcoin-cross-toolchain "i686-linux-gnu")
but not a huge deal.

My bad I didn't see "i686 can still be built in depends (tested by ci/travis) and in guix/gitian by setting the appropriate HOSTS."

ACK fae9084 patch looks correct

fanquake added a commit that referenced this pull request Feb 11, 2020
fae9084 build: Skip i686 build by default in guix and gitian (MarcoFalke)
fa55a25 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 fae9084 -- patch looks correct
  dongcarl:
    ACK fae9084 patch looks correct
  laanwj:
    Code review ACK fae9084
  hebasto:
    ACK fae9084, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: b000c19a2cd2a596a52028fa298c4022c24cfdfc1bdb3795a90916d0a00a32e4dd22278db93790b6a11724e08ea8451f4f05c77bc40d1664518e11a8c82d6e29
@fanquake fanquake merged commit fae9084 into bitcoin:master Feb 11, 2020
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@MarcoFalke MarcoFalke deleted the MarcoFalke:2002-i686NoBuildByDefault branch Feb 11, 2020
@DrahtBot

This comment has been minimized.

Copy link
Contributor

DrahtBot commented Feb 11, 2020

Gitian builds

File commit 646f0ad
(master)
commit e0e64f6
(master and this pull)
bitcoin-0.19.99-aarch64-linux-gnu-debug.tar.gz 9a0f845f3f6be5be... 6e360a27965d687c...
bitcoin-0.19.99-aarch64-linux-gnu.tar.gz 8a25b2286ed0794b... bf1f340297fb2f03...
bitcoin-0.19.99-arm-linux-gnueabihf-debug.tar.gz 1fee3b11eca20046... 739b25d36fd4ee84...
bitcoin-0.19.99-arm-linux-gnueabihf.tar.gz 2a8402a41d62e989... 2fe351b4f97fb226...
bitcoin-0.19.99-i686-pc-linux-gnu-debug.tar.gz 79ec741e2c97bcb4...
bitcoin-0.19.99-i686-pc-linux-gnu.tar.gz 8a6bab3030e3f102...
bitcoin-0.19.99-osx-unsigned.dmg 4a836641d200ad86... 04300c89f0a6185f...
bitcoin-0.19.99-osx64.tar.gz 574878c954f65336... b0673a72c47a8306...
bitcoin-0.19.99-riscv64-linux-gnu-debug.tar.gz 8a5ffb502fdfbfea... eebf7815cd91d024...
bitcoin-0.19.99-riscv64-linux-gnu.tar.gz 0c4b9bed5092f6f4... a098a8ef427152cb...
bitcoin-0.19.99-win64-debug.zip e0e0db49aba2546f... d88e882e17e10ca0...
bitcoin-0.19.99-win64-setup-unsigned.exe bf40c7f5f0bb6a86... 30f21fe4f5cf454d...
bitcoin-0.19.99-win64.zip 338932e900951da5... 8c76fcaac536c964...
bitcoin-0.19.99-x86_64-linux-gnu-debug.tar.gz 1fd82e68bd642dcd... 7d172e7d2f935172...
bitcoin-0.19.99-x86_64-linux-gnu.tar.gz e45163e3c0d929b5... a366c5cbc480056a...
bitcoin-0.19.99.tar.gz c31ddf1517a24061... 067620a174f9431a...
bitcoin-core-linux-0.20-res.yml f00d3705cd81465d... 44c610b19cc97d7e...
bitcoin-core-osx-0.20-res.yml eae4b251bcbc5229... 1480f0cc1f76b2e0...
bitcoin-core-win-0.20-res.yml 82e598951b1e2b57... 546af43b8b2d736e...
linux-build.log 37875d5a1634e188... 301e4ac81b6d6c67...
osx-build.log 4e66c49954c10965... d4ef35d072457da6...
win-build.log a7274ebd8b614c4a... 9c6866a33cb87022...
bitcoin-core-linux-0.20-res.yml.diff 14826e17f75c3718...
bitcoin-core-osx-0.20-res.yml.diff 4b8db01fd2907821...
bitcoin-core-win-0.20-res.yml.diff a43bcaff53ac6144...
linux-build.log.diff 209bcaa9fdf2ce91...
osx-build.log.diff 26b916c60783179d...
win-build.log.diff 001be83b5a193812...
@dnprock

This comment has been minimized.

Copy link

dnprock commented Mar 23, 2020

@MarcoFalke I came across this PR. I notice there's still references to i686 in gitian-linux descriptor.

https://github.com/bitcoin/bitcoin/blob/master/contrib/gitian-descriptors/gitian-linux.yml#L103

Should they be removed as well?

@hebasto

This comment has been minimized.

Copy link
Member

hebasto commented Mar 28, 2020

@dnprock

@MarcoFalke I came across this PR. I notice there's still references to i686 in gitian-linux descriptor.

https://github.com/bitcoin/bitcoin/blob/master/contrib/gitian-descriptors/gitian-linux.yml#L103

Should they be removed as well?

From the OP:

i686 can still be built in depends (tested by ci/travis) and in guix/gitian by setting the appropriate HOSTS.

@MarkLTZ MarkLTZ mentioned this pull request Apr 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

8 participants
You can’t perform that action at this time.