samueldr changed the topic of #nixos-dev to: #nixos-dev NixOS Development (#nixos for questions) | NixOS 19.09 is released! https://discourse.nixos.org/t/nixos-19-09-release/4306 | https://hydra.nixos.org/jobset/nixos/trunk-combined https://channels.nix.gsc.io/graph.html | https://r13y.com | 19.09 RMs: disasm, sphalerite | https://logs.nix.samueldr.com/nixos-dev
orivej has quit [Ping timeout: 240 seconds]
lassulus has quit [Ping timeout: 250 seconds]
justanotheruser has quit [Ping timeout: 240 seconds]
justanotheruser has joined #nixos-dev
lassulus has joined #nixos-dev
lopsided98_ is now known as lopsided98
red[evilred] has joined #nixos-dev
<red[evilred]> So, I apparently broke a whole bunch of stuff in my PR
<red[evilred]> here's how it went
<red[evilred]> made a new local branch, made my changes, pushed new branch to github, opened my PR
<red[evilred]> I wanted to bring my master in sync with upstream, so I pulled upstream and merged it with the branch.
<red[evilred]> when I pushed, I ended up with two commits in my PR
<red[evilred]> one, my original. The second the merge with master
<red[evilred]> (But it still only said one file to change)
<red[evilred]> So... I thought to myself - I'll just squash that - then it will be one commit, one file, and life will be awesome
<red[evilred]> So, this is before the squash:
* red[evilred] uploaded an image: image.png (24KB) < https://evil.red:8448/_matrix/media/r0/download/evil.red/GkHFyYhaJnjNRcozyhCFcQJL >
<red[evilred]> See... 1 file, how much damage could I do with a little squash eh? ;-)
<red[evilred]> ... apparently this much damage:
* red[evilred] uploaded an image: image.png (17KB) < https://evil.red:8448/_matrix/media/r0/download/evil.red/EmDQPjLyquKpxrrxLZOHWCEl >
<red[evilred]> 49 files changed
<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
<{^_^}> https://github.com/NixOS/nixpkgs/pull/73594 (by redvers, 31 minutes ago, open): WIP: ponyc: 0.32.0 -> 0.33.0 (aka, I broke it when trying to squash)
<qyliss> Duplicate PRs are annoying
<qyliss> Well, if you want to do it again, do it again up to the point where you'd create a new PR, but then force push to the existing one instead
<__red__> how would one do that?
<__red__> blow away the branch on my github, create a new one with the same name?
<qyliss> Don't delete the branch on GitHub
<__red__> (I'm guessing not)
<qyliss> You can delete it locally
<qyliss> But if you delete it on GitHub it will close the PR
<__red__> okay, so delete locally, re-create, push up (and likely force)
<__red__> I'll give that a shot
<qyliss> Yep
<qyliss> You can also just git reset --hard 05bf7f5 to get your branch back to where you were
<qyliss> (that'll discard uncommitted changes though, be careful)
<qyliss> Sleep now, good luck :)
<ryantm> Why do we ask people to do a separate commit for adding themselves to the maintainer list?
<gchristensen> in case of future backports
<__red__> Okay
<samueldr> we also ask commits to be self-contained logical units
<__red__> I now have a clean, single-file commit
<pie__> i read that as <samueldr> we also ask commiters to be self-contained logical units
<samueldr> I believe most are
LnL has joined #nixos-dev
LnL has joined #nixos-dev
LnL has quit [Changing host]
justan0theruser has joined #nixos-dev
justanotheruser has quit [Ping timeout: 240 seconds]
drakonis has quit [Quit: WeeChat 2.6]
andi- has quit [Ping timeout: 252 seconds]
andi- has joined #nixos-dev
orivej has joined #nixos-dev
red[evilred] has quit [Quit: Idle timeout reached: 10800s]
eraserhd has quit [Quit: WeeChat 2.6]
eraserhd has joined #nixos-dev
eraserhd2 has joined #nixos-dev
eraserhd2 has quit [Client Quit]
MichaelRaskin has quit [Quit: MichaelRaskin]
ckauhaus has joined #nixos-dev
<dtz> Lmao <3
ckauhaus has quit [Ping timeout: 246 seconds]
ddima has quit [Quit: Lost terminal]
ckauhaus has joined #nixos-dev
orivej has quit [Ping timeout: 265 seconds]
lopsided98 has quit [Ping timeout: 250 seconds]
lopsided98 has joined #nixos-dev
__monty__ has joined #nixos-dev
psyanticy has joined #nixos-dev
NinjaTrappeur has quit [Quit: WeeChat 2.6]
NinjaTrappeur has joined #nixos-dev
orivej has joined #nixos-dev
drakonis has joined #nixos-dev
evanjs has quit [Quit: ZNC 1.7.4 - https://znc.in]
evanjs has joined #nixos-dev
evanjs has quit [Client Quit]
evanjs has joined #nixos-dev
lassulus has quit [Quit: WeeChat 2.6]
lassulus has joined #nixos-dev
mmlb has joined #nixos-dev
ckauhaus has quit [Quit: WeeChat 2.6]
orivej has quit [Ping timeout: 245 seconds]
red[evilred] has joined #nixos-dev
<red[evilred]> I have a confession to make... I saw this: https://logs.nix.ci/?key=nixos/nixpkgs.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
<{^_^}> https://github.com/NixOS/rfcs/pull/42 (by Infinisil, 34 weeks ago, open): [RFC 0042] NixOS settings options
<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
evanjs has quit [Quit: ZNC 1.7.5 - https://znc.in]
drakonis_ has joined #nixos-dev
drakonis has quit [Quit: WeeChat 2.6]
evanjs has joined #nixos-dev
drakonis has joined #nixos-dev
orivej has joined #nixos-dev
drakonis_ has quit [Ping timeout: 240 seconds]
drakonis_ has joined #nixos-dev
<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
Synthetica has joined #nixos-dev
edwtjo has quit [Ping timeout: 265 seconds]
evanjs has quit [Quit: ZNC 1.7.5 - https://znc.in]
evanjs has joined #nixos-dev
ddima has joined #nixos-dev
eraserhd2 has joined #nixos-dev
eraserhd has quit [Ping timeout: 250 seconds]
Mic92 has quit [Quit: WeeChat 2.6]
Jackneill has quit [Remote host closed the connection]
ixxie has joined #nixos-dev
red[evilred] has quit [Quit: Idle timeout reached: 10800s]
psyanticy has quit [Quit: Connection closed for inactivity]
ixxie has quit [Ping timeout: 240 seconds]
Jackneill has joined #nixos-dev
drakonis_ has quit [Ping timeout: 245 seconds]
drakonis_ has joined #nixos-dev
Jackneill has quit [Remote host closed the connection]
drakonis_ has quit [Read error: Connection reset by peer]
drakonis_ has joined #nixos-dev
drakonis_ has quit [Read error: Connection reset by peer]
<gchristensen> hydra built nearly 8,000 steps in the last 4h :')
drakonis has quit [Read error: Connection reset by peer]
v0|d has joined #nixos-dev