<red[evilred]>
so - it will probably be easier for me to just delete the PR and start again - but just in case there's a learning opportunity here - can someone tell me what on earth I did wrong? :-) <3
<qyliss>
Don't try to squash merge commits
<qyliss>
It'll try to replay all the new commits introduced by the merge one by one
<qyliss>
And in general, don't merge into one-commit feature branches -- doesn't get you anything and pollutes the history
<__red__>
Okay - so for future reference if I end up in that sitation again I can just ignore it?
<qyliss>
Instead, you should rebase
<qyliss>
Onto the latest upstream
sheenobu has joined #nixos-dev
<qyliss>
Unless there is some reason to like a conflict or a fix you need to pull in for CI, there's no reason to merge/rebase in a PR
<__red__>
I think I'm going to burn this PR to the ground and just do it again
<qyliss>
Please don't
<__red__>
Okay - can you take a look and tell me how I would go about fixing it? #73594
<red[evilred]>
and my immediate reaction was: "Wow, someone has made a web-based man page streamer..." :-)
<red[evilred]>
now to reformat all my logs into nroff format
<infinisil>
Hehe
<gchristensen>
feels weird having only 15,000 queued steps
<gchristensen>
is master broken? :P
<red[evilred]>
well, aarch64-linux ofborg appears stalled on one of my PRs
<red[evilred]>
but I'm guessing that the whole development chain doesn't block on a single arch
<gchristensen>
and ofborg is totalyl unrelated to hydra
<infinisil>
globin: Hey, regarding rfcs#42, I actually might not have time on Thursday after all, since it's the day I need to hand in my bachelors thesis and I'm currently very stressed to get it finished
<infinisil>
globin: After that it's smooth sailing for me though and I should have plenty time
<gchristensen>
if you ever looked at https://status.nixos.org/grafana/d/MJw9PcAiz/hydra-jobs?orgId=1&refresh=30s and thought «how strange, the "running steps" number is way less than what "Running Jobs By Type" graph shows» then good news: the top row of graphs was showing the average of the data (oops) and now shows the Current value
<gchristensen>
another improvement: "queued jobs per machine type" sometimes mysteriously shows very low numbers when "Steps Queued" is high. I renamed it to "Runnable Steps per Machine Type" which is actually what it is displaying. if there is a difference between runnable and queued, it means the queued jobs are not yet runnable because they depend on another job which is runnable
<gchristensen>
and "runnable" doesn't include "running" so for example right now it says 0 are runnable and 26 darwin jobs are building, once the currently running jobs finish, more ofthe 599 queued jobs will be runnable