[Nix-dev] How does the branching currently work?

[Luca Bruno]

The last nixos release has seen only 1 hydra failure. That's possible :)

On Sat, Jul 18, 2015 at 7:23 PM, Matthias Beyer <mail at beyermatthias.de>
wrote:

> sounds reasonable.
>
> Maybe we should also abandon the 15.10 release. I really don't think
> we will make it with 15.07 until the end of this very month.
>
> I guess 15.10 -> 15.12 or even 16.01 would be better, don't you think
> so?
>
> Also: 9k failures, wow. zero would be nice, really! :-)
>
> Thanks for the explanations!
>
>
> On 18-07-2015 19:18:16, Luca Bruno wrote:
> > There are important fixes in staging and we're waiting for hydra to
> > complete and merge into master. Then I guess we want to drop the number
> of
> > hydra failures a little, 9k failures is a bit too much in my opinion.
> >
> > On Sat, Jul 18, 2015 at 7:16 PM, Matthias Beyer <mail at beyermatthias.de>
> > wrote:
> >
> > > Okay,... so let me ask a followup question:
> > >
> > > Why isn't there a release-15.07 branch, yet?
> > >
> > > On 18-07-2015 17:59:37, Luca Bruno wrote:
> > > > That's it. Additionally there's the staging branch for mass-rebuilds
> > > (like
> > > > stdenv changes), to avoid people tracking master recompiling the
> world.
> > > > Once staging builds on hydra it means there are binaries available
> and it
> > > > gets merged into master.
> > > >
> > > > On Sat, Jul 18, 2015 at 5:56 PM, Matthias Beyer <
> mail at beyermatthias.de>
> > > > wrote:
> > > >
> > > > > Hi,
> > > > >
> > > > > I'd really like to know how the branching in nixpkgs work.
> > > > >
> > > > > From what I can see, it works like this:
> > > > >
> > > > > * PRs are done to master
> > > > > * On a release, we branch off of master and create a
> nixos-<version>
> > > > >   branch
> > > > >   * Only fixes get applied to this branch
> > > > > * nixos-unstable is just a specific commit on master which builds
> > > > >   successfully on hydra
> > > > >
> > > > > And that's it, isn't it? I mean, that'd be the simplest working
> > > > > approach IMO, but maybe you guys are doing something else, I don't
> > > > > know?
> > > > >
> > > > > --
> > > > > Mit freundlichen Grüßen,
> > > > > Kind regards,
> > > > > Matthias Beyer
> > > > >
> > > > > Proudly sent with mutt.
> > > > > Happily signed with gnupg.
> > > > >
> > > > > _______________________________________________
> > > > > nix-dev mailing list
> > > > > nix-dev at lists.science.uu.nl
> > > > > http://lists.science.uu.nl/mailman/listinfo/nix-dev
> > > > >
> > > > >
> > > >
> > > >
> > > > --
> > > > NixOS Linux <http://nixos.org>
> > >
> > > --
> > > Mit freundlichen Grüßen,
> > > Kind regards,
> > > Matthias Beyer
> > >
> > > Proudly sent with mutt.
> > > Happily signed with gnupg.
> > >
> >
> >
> >
> > --
> > NixOS Linux <http://nixos.org>
>
> --
> Mit freundlichen Grüßen,
> Kind regards,
> Matthias Beyer
>
> Proudly sent with mutt.
> Happily signed with gnupg.
>



-- 
NixOS Linux <http://nixos.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.science.uu.nl/pipermail/nix-dev/attachments/20150718/aedfa3f1/attachment.html