Adam Spiers 🇪🇺🇬🇧🇮🇪🦇🔊

@aspiers
107 Followers
121 Following
29 Posts

Multi-genre cellist and FL/OSS web3 architect, working on ReFi for Toucan Protocol
and privacy/trust for Panther Protocol.

Proud European 🇪🇺🇬🇧🇮🇪 #StandWithUkraine 🇺🇦
$eth HODLer 🦇🔊

Websitehttps://adamspiers.org
GitHubhttps://github.com/aspiers
Show threadAdam Spiers 🇪🇺🇬🇧🇮🇪🦇🔊Nov 7, 2024
@tserong @lathiat Sorry just seeing this - apparently I don't use mastodon often enough. You might be after https://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/
Easier upstreaming / back-porting of patch series with git – Structured Procrastination

Have you ever needed to port a selection of commits from one git branch to another, but without doing a full merge? This is a common challenge, e.g. forward-porting / upstreaming bugfixes from a stable release branch to a development branch, or back-porting features from a development branch to a stable release branch. Of course, […]

Structured Procrastination
Show threadAdam Spiers 🇪🇺🇬🇧🇮🇪🦇🔊Feb 17, 2023
@xahteiwi My preference is to ask smart experts who have already been through the pain 😜 But if your conclusion is "it's not worth it, use GitLab" and mine was "please god anything but GitLab or GitHub", then it might be really interesting to get together to compare the pros and cons at some point... or should I say, cons and cons 🤦‍♂️ 😆
Show threadAdam Spiers 🇪🇺🇬🇧🇮🇪🦇🔊Feb 16, 2023

@xahteiwi BTW I did substantial research before concluding that this is currently nowhere near solved or even solvable in GitLab, e.g. https://gitlab.com/gitlab-org/gitlab/-/issues/11393#note_1014000534

I could easily do a 90 minute talk on this whole topic. Luckily I don't have the time for that ;-)

Complex merge order dependencies (#11393) · Issues · GitLab.org / GitLab · GitLab

Problem to solve In https://gitlab.com/gitlab-org/gitlab-ee/issues/9688 , we're adding the first iteration of merge ordering - this forms a directed acyclical...

GitLab
Show threadAdam Spiers 🇪🇺🇬🇧🇮🇪🦇🔊Feb 16, 2023

@xahteiwi Regarding the former, I did partially enumerate that, as you probably remember: https://bit.ly/code-review-comparison

However I have a lot more to say on that topic, and in particular how GitHub's/GitLab's design decision of allowing multiple commits per review cycle has a profoundly negative impact on code quality and team efficiency.

Regarding the latter (the downsides of Gerrit/Zuul setup), that was basically the point of my original question.

GitHub vs. Gerrit vs. GitLab

github-gerrit Rosetta stone translating workflows between GitHub / Gerrit / GitLab GitHub,GitLab,OpenStack Gerrit (review.opendev.org) Concepts / design Name for a change uploaded for review,Pull request (a.k.a. PR),Merge request (a.k.a. MR),Review Number of commits allowed in a review,Any (non-...

Google Docs
Show threadAdam Spiers 🇪🇺🇬🇧🇮🇪🦇🔊Feb 16, 2023
@xahteiwi I asked for "the most painless way", not an *entirely* painless way ;-)
Show threadAdam Spiers 🇪🇺🇬🇧🇮🇪🦇🔊Feb 13, 2023
@xahteiwi Any recommendations on the most painless way to host Zuul? Do you have a Heat template or whatever the modern equivalent is these days?
Show threadAdam Spiers 🇪🇺🇬🇧🇮🇪🦇🔊Feb 13, 2023
@xahteiwi I can live with difficult setup as long as it's a one-time thing - the rewards of getting away from hideous GitHub code review can justify a huge up-front cost ...
Show threadAdam Spiers 🇪🇺🇬🇧🇮🇪🦇🔊Feb 13, 2023
Actually, https://zuul-ci.org/docs/zuul/latest/drivers/github.html#configure-github seems to suggest that GitHub actions are supported after all - hopping on the Zuul Matrix channel to ask some old OpenInfra friends for advice...
GitHub — Zuul documentation

Show threadAdam Spiers 🇪🇺🇬🇧🇮🇪🦇🔊Feb 13, 2023
And when I wrote "Dear lazyweb", I really meant "Dear @xahteiwi or any Zuul guys who are hiding on here" ...
Adam Spiers 🇪🇺🇬🇧🇮🇪🦇🔊Feb 6, 2023
Dear lazyweb, I have a GitHub (mono)repo with a bunch of CI implemented as GitHub Actions. I want to move away from GitHub's godawful PR review design towards a sensible system which enforces one commit per review cycle, e.g. all the goodness of Gerrit plus Zuul for CI and policy-based merges, but without having to rewrite CI from scratch or lose branch protection. Is this easily doable? Tools like spr and ghstack for stacking 1-commit PRs only solve part of the problem.