ci: use depends for s390x #17661

elichai · 2019-12-03T22:31:37Z

Related: #17599

This adds qemu support just like we have in arm and compile the depends.

other than that I also fixed some missing includes to make the depends compile.

DrahtBot · 2019-12-04T00:07:49Z

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

Conflicts

No conflicts as of last run.

maflcko

sweet

ci/test/00_setup_env_s390x.sh

elichai · 2019-12-04T15:57:41Z

@MarcoFalke arghh it looks like the rebase screwed some stuff up. fixing

ci/test/00_setup_env_s390x.sh

elichai · 2019-12-04T17:33:06Z

I don't get it.
the exact same commit passes on my private travis but fails here.
https://travis-ci.org/elichai/bitcoin/builds/620711066

maflcko · 2019-12-04T21:11:26Z

the exact same commit passes on my private travis but fails here.

The depends cache is never invalidated. See bug #17248 . So when it is created once, you can break the build, but travis won't fail.

elichai · 2019-12-05T10:17:34Z

The depends cache is never invalidated. See bug #17248 . So when it is created once, you can break the build, but travis won't fail.

That's bad. I guess I need to remove my cache, and it might also mean that most of the testing i've done were moot :(

elichai · 2019-12-05T13:12:59Z

Lol, I don't really know what happened but i'll clean the commits up now and then it should be ready

maflcko · 2019-12-05T15:12:49Z

ACK a817928 (didn't review depends build changes)

maflcko · 2019-12-11T21:12:58Z

@elichai 🙏 Trivial rebase. I can pick it up after that.

maflcko

ACK after applying my diff to fix the build and adjusting OP

DrahtBot · 2019-12-15T08:04:40Z

Gitian builds

File	commit `c5e318a` (master)	commit `0061b7b` (master and this pull)
bitcoin-0.19.99-aarch64-linux-gnu-debug.tar.gz	`bea40f9a3e1e3d15...`	`a98f522b7e7ff91b...`
bitcoin-0.19.99-aarch64-linux-gnu.tar.gz	`6062abc6a838a5a6...`	`ebc4dbe686d18f80...`
bitcoin-0.19.99-arm-linux-gnueabihf-debug.tar.gz	`69dcc7a49e222ca9...`	`2a552d16d640fadc...`
bitcoin-0.19.99-arm-linux-gnueabihf.tar.gz	`d0e369041d9fe9b5...`	`c0018bacd165877e...`
bitcoin-0.19.99-i686-pc-linux-gnu-debug.tar.gz	`d3b7c55ff3c2bc2f...`	`84a0133ad9aa9f2c...`
bitcoin-0.19.99-i686-pc-linux-gnu.tar.gz	`ae365922d91820b9...`	`ce52b8ba3748167e...`
bitcoin-0.19.99-osx-unsigned.dmg	`d5388aa2474ac73e...`	`3d5701d1b95e353c...`
bitcoin-0.19.99-osx64.tar.gz	`4baf8f214f059caf...`	`2f8d4aca89d2725d...`
bitcoin-0.19.99-riscv64-linux-gnu-debug.tar.gz	`6b0e20d11cb5fe6b...`	`55b967d9ccc17e21...`
bitcoin-0.19.99-riscv64-linux-gnu.tar.gz	`0d45828e7aac5e93...`	`e67889265ed13b9a...`
bitcoin-0.19.99-win64-debug.zip	`5669c48e3fad4bc5...`	`507713b1cb0230a8...`
bitcoin-0.19.99-win64-setup-unsigned.exe	`6fc70664b2973325...`	`3f49d90170510f93...`
bitcoin-0.19.99-win64.zip	`576846961cf26ff2...`	`db60fc2d1312a0a7...`
bitcoin-0.19.99-x86_64-linux-gnu-debug.tar.gz	`591688b38863b8b4...`	`c938e51ff29b599a...`
bitcoin-0.19.99-x86_64-linux-gnu.tar.gz	`e8dcc933264b4d6c...`	`4c3b2c21eec6a881...`
bitcoin-0.19.99.tar.gz	`9d45221fe86cb679...`	`6166d27f5215b5b5...`
bitcoin-core-linux-0.20-res.yml	`2efef3cbffb806a2...`	`b3b604fe76703726...`
bitcoin-core-osx-0.20-res.yml	`d2ea6d1607e9fd97...`	`2f8687cf09b7a1cc...`
bitcoin-core-win-0.20-res.yml	`93ecd38034110860...`	`bc8819618d3b2a1d...`
linux-build.log	`b3d2ce067eb93baa...`	`10693a0201957226...`
osx-build.log	`f3e9977f0c38cddd...`	`8dd6cc0ef0f7e3cf...`
win-build.log	`91466d2d19dec4e6...`	`3bf8f42281562e0c...`
bitcoin-core-linux-0.20-res.yml.diff		`fea7b047d0e61a81...`
bitcoin-core-osx-0.20-res.yml.diff		`fc8e5feb98279eea...`
bitcoin-core-win-0.20-res.yml.diff		`0e7fe61b8dc92eee...`
linux-build.log.diff		`1b744686269d5ca2...`
osx-build.log.diff		`6d66ed27e8c6b710...`
win-build.log.diff		`b9ba672e8d39be29...`

maflcko · 2019-12-16T15:57:34Z

ACK e190000 (first commit only, didn't look at second commit)

maflcko · 2019-12-16T17:36:01Z

Why is the second commit needed? Travis passes without it, no?

elichai · 2019-12-16T18:04:08Z

Why is the second commit needed? Travis passes without it, no?

Hmm is it possible that one of your fixes somehow fixed this too?
I'll reset my travis cache (to avoid the bug you talked about) and rerun the tests on that commit only.
Because when I opened the PR this was definitely a problem

maflcko · 2019-12-16T22:17:00Z

I tried it in my repo and it worked: https://travis-ci.org/MarcoFalke/bitcoin-core/jobs/625746803

elichai · 2019-12-17T14:54:19Z

I tried it in my repo and it worked: https://travis-ci.org/MarcoFalke/bitcoin-core/jobs/625746803

Done. don't think I understand what's going on in the depends anymore.

maflcko · 2019-12-17T15:02:13Z

Done. don't think I understand what's going on in the depends anymore.

No one does, that I am aware of

dongcarl · 2019-12-17T15:08:28Z

On my TODO list to take a look at this week

maflcko · 2019-12-17T15:46:20Z

I'll probably just merge this. All it does is set the proper cross compile HOST, remove NO_DEPENDS=1 and remove all the packages from apt to install.

I broke the qemu-wrapper script in the ci system I wrote, so for proper cross-compilation and cross-running the tests in qemu (e.g. on aarch64, riscv64 or x86_64 architecture) I'll need to do a follow up pull anyway.

e190000 ci-s390x: Add qemu and depends support in the ci script (Elichai Turkel) Pull request description: Related: bitcoin#17599 This adds qemu support just like we have in arm and compile the depends. other than that I also fixed some missing includes to make the depends compile. ACKs for top commit: MarcoFalke: ACK e190000 (first commit only, didn't look at second commit) Tree-SHA512: 2b8a39772b86408569f52cdc33832dbce7e5e9cdd710524295f3d259628cdfc017e740f6f94941307d7f8e413236814a95ba851153c617eb5fb75b4bd9a7e52f

fanquake added the Tests label Dec 3, 2019

maflcko reviewed Dec 4, 2019

View reviewed changes

ci/test/00_setup_env_s390x.sh Outdated Show resolved Hide resolved

ci/test/00_setup_env_s390x.sh Outdated Show resolved Hide resolved

ci/test/00_setup_env_s390x.sh Show resolved Hide resolved

elichai force-pushed the 2019-11-s390x branch from 2b3eada to a9f3241 Compare December 4, 2019 16:38

fanquake reviewed Dec 4, 2019

View reviewed changes

ci/test/00_setup_env_s390x.sh Outdated Show resolved Hide resolved

maflcko added Build system and removed Tests labels Dec 4, 2019

maflcko changed the title ~~ci: compile and fix depends for s390x~~ build: fix depends for s390x and use it in ci Dec 4, 2019

elichai force-pushed the 2019-11-s390x branch from 70efac4 to a817928 Compare December 5, 2019 13:17

maflcko added the Needs gitian build label Dec 5, 2019

DrahtBot removed the Needs gitian build label Dec 7, 2019

bitcoin deleted a comment from DrahtBot Dec 9, 2019

DrahtBot added the Needs rebase label Dec 9, 2019

maflcko added the Needs gitian build label Dec 11, 2019

elichai force-pushed the 2019-11-s390x branch from a817928 to 17af6b6 Compare December 12, 2019 10:26

DrahtBot removed the Needs rebase label Dec 12, 2019

maflcko approved these changes Dec 13, 2019

View reviewed changes

ci-s390x: Add qemu and depends support in the ci script

e190000

elichai force-pushed the 2019-11-s390x branch from 17af6b6 to 8c44799 Compare December 14, 2019 16:27

DrahtBot removed the Needs gitian build label Dec 15, 2019

elichai requested review from dongcarl and fanquake December 16, 2019 15:12

elichai force-pushed the 2019-11-s390x branch from 8c44799 to e190000 Compare December 17, 2019 14:34

maflcko changed the title ~~build: fix depends for s390x and use it in ci~~ ci: use depends for s390x Dec 17, 2019

maflcko merged commit e190000 into bitcoin:master Dec 17, 2019

elichai deleted the 2019-11-s390x branch December 18, 2019 12:27

MarkLTZ mentioned this pull request Apr 4, 2020

Bitcoin PR tracking litecoinz-core/litecoinz#14

Closed

bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021

ci: use depends for s390x #17661

ci: use depends for s390x #17661

Uh oh!

Conversation

elichai commented Dec 3, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DrahtBot commented Dec 4, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Conflicts

Uh oh!

maflcko left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

elichai commented Dec 4, 2019

Uh oh!

Uh oh!

elichai commented Dec 4, 2019

Uh oh!

maflcko commented Dec 4, 2019

Uh oh!

elichai commented Dec 5, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

elichai commented Dec 5, 2019

Uh oh!

maflcko commented Dec 5, 2019

Uh oh!

maflcko commented Dec 11, 2019

Uh oh!

maflcko left a comment

Choose a reason for hiding this comment

Uh oh!

DrahtBot commented Dec 15, 2019

Gitian builds

Uh oh!

maflcko commented Dec 16, 2019

Uh oh!

maflcko commented Dec 16, 2019

Uh oh!

elichai commented Dec 16, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

maflcko commented Dec 16, 2019

Uh oh!

elichai commented Dec 17, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

maflcko commented Dec 17, 2019

Uh oh!

dongcarl commented Dec 17, 2019

Uh oh!

maflcko commented Dec 17, 2019

Uh oh!

Uh oh!

elichai commented Dec 3, 2019 •

edited

Loading

DrahtBot commented Dec 4, 2019 •

edited

Loading

elichai commented Dec 5, 2019 •

edited

Loading

elichai commented Dec 16, 2019 •

edited

Loading

elichai commented Dec 17, 2019 •

edited

Loading