Re: [Tails-dev] Automerge of devel into feature/buster?

2019-03-07 Thread intrigeri
Hi, Sandro Knauß: >> Sure. I've answered part of it above. On top of that, please read the > "Overview" and "Build system" sections of the corresponding doc: https:// > tails.boum.org/contribute/APT_repository/custom/ then let me know if there's > anything left unclear. > What I find is not cle

Re: [Tails-dev] Automerge of devel into feature/buster?

2019-03-07 Thread Sandro Knauß
Hey, > Sure. I've answered part of it above. On top of that, please read the "Overview" and "Build system" sections of the corresponding doc: https:// tails.boum.org/contribute/APT_repository/custom/ then let me know if there's anything left unclear. What I find is not clear enough: How new pac

Re: [Tails-dev] Automerge of devel into feature/buster?

2019-03-05 Thread intrigeri
Hi, Sandro Knauß: > intrigeri: >> A) Treat feature/buster as any other topic branch (status quo) >> >>Pros: >>- We don't have to maintain a full-blown feature-buster APT suite. > What is meant by "full-blown APT suite". An APT suite that has _all_ our custom packages, e.g. tails-gree

Re: [Tails-dev] Automerge of devel into feature/buster?

2019-02-26 Thread Sandro Knauß
Hi, I'll first have to get some answers, as currently I feel that I have too less information to do a decision. > I believe there are three main ways to handle this. We've tried the > first two ones below (A and B) extensively. You might be proposing > a third one (C): > > A) Treat feature/bust

Re: [Tails-dev] Automerge of devel into feature/buster?

2019-01-28 Thread intrigeri
Hi, Cyril Brulebois: > […] the build in Jenkins failed because devel is automatically > merged into it. Yes, so far feature/buster has been treated like any other topic branch, i.e. its base branch is "devel", and then when building feature/buster: 1. As you've noticed, on Jenkins we merge devel

[Tails-dev] Automerge of devel into feature/buster?

2019-01-14 Thread Cyril Brulebois
Hi, As a background task, I have been checking what was happening regarding snapshots vs. feature/buster, and finally pushed a revert of an earlier commit of mine (https://redmine.tails.boum.org/code/issues/16316) but the build in Jenkins failed because devel is automatically merged into it. Does