Skip to content

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Jul 8, 2021

Note that this doesn't yet touch any glibc back compat related code.

@hebasto
Copy link
Member

hebasto commented Jul 8, 2021

Concept ACK.

@laanwj
Copy link
Member

laanwj commented Jul 8, 2021

Concept ACK, but after the 22.0 release. I think it makes sense to wait until we have done a successful GUIX release before dropping all gitian support.

@hebasto
Copy link
Member

hebasto commented Jul 8, 2021

@laanwj

but after the 22.0 release.

Not arguing, just noticing that in the current state gitian builds do not pass symbol check. If gitian remains in the repo for 22.0 release, it must be fixed with #22281, #22287, #22305, #22318, #22321.

Hope to discuss this topic today.

@maflcko maflcko changed the title [WIIP] release: Remove gitian [WIP] release: Remove gitian Jul 8, 2021
@maflcko
Copy link
Member

maflcko commented Jul 8, 2021

I don't think it matters when this is merged. Even if this is removed for 22.0, calling git revert 2338298190 if needed should be trivial because there can't be any conflicts.

@fanquake
Copy link
Member Author

fanquake commented Jul 8, 2021

If gitian remains in the repo for 22.0 release, it must be fixed with #22281, #22287, #22305, #22318, #22321.

I would very much rather avoid all of those PRs. Even more back compat code, and hacking up our dependencies to fix a system that currently, we aren't even going to use for the release, and if gitian is going to be removed then it'd all just have to be reverted / removed.

@achow101
Copy link
Member

achow101 commented Jul 8, 2021

Why not have gitian do the guix build? I know at least one person has mentioned previously that they preferred that.

@DrahtBot
Copy link
Contributor

DrahtBot commented Jul 8, 2021

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #22708 ([PoC] build, qt: Add Wayland support for Linux builds with depends by hebasto)

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
Copy link
Member

laanwj commented Jul 21, 2021

Not arguing, just noticing that in the current state gitian builds do not pass symbol check. If gitian remains in the repo for 22.0 release, it must be fixed with #22281, #22287, #22305, #22318, #22321.

Agree, I am aware it is broken at the moment and I'm not arguing that it should be fixed up right now, I'd just prefer to wait with removing gitian completely until a successful release with guix has been done.

Once we've been through the whole process (updating it where necessary) and no unexpected snags turn up (including with people testing the rcs), merging this is fine.

@fanquake fanquake changed the title [WIP] release: Remove gitian release: Remove gitian Jul 23, 2021
@@ -7,7 +7,7 @@
export LC_ALL=C.UTF-8

export CONTAINER_NAME=ci_win64
export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to win64 (Focal is used in the gitian build as well)
export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to win64
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be good to replace with a comment to explain why Focal was picked:

LTS that offers a compiler closest to the guix-win64 compiler

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can address this along with another change

@fanquake fanquake marked this pull request as ready for review August 31, 2021 01:42
@fanquake fanquake added this to the 23.0 milestone Aug 31, 2021
@laanwj
Copy link
Member

laanwj commented Aug 31, 2021

Code review ACK ab9c342

@maflcko maflcko merged commit 245462b into bitcoin:master Sep 2, 2021
@fanquake fanquake deleted the remove_gitian branch September 2, 2021 08:39
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Sep 2, 2021
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 2, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants