[00:01] -kubuntu-ci:#kubuntu-devel- Project merger_kcoreaddons build #810: FAILURE in 50 sec: http://kci.pangea.pub/job/merger_kcoreaddons/810/ [00:03] -kubuntu-ci:#kubuntu-devel- Project merger_kdiamond build #650: FAILURE in 2 min 53 sec: http://kci.pangea.pub/job/merger_kdiamond/650/ [00:06] -kubuntu-ci:#kubuntu-devel- Starting build #5 for job mgmt_pause_integration (previous build: ABORTED) [00:06] -kubuntu-ci:#kubuntu-devel- Project mgmt_progenitor build #710: ABORTED in 6 min 36 sec: http://kci.pangea.pub/job/mgmt_progenitor/710/ [00:07] -kubuntu-ci:#kubuntu-devel- Project mgmt_merger build #725: STILL UNSTABLE in 7 min 33 sec: http://kci.pangea.pub/job/mgmt_merger/725/ [00:40] ok wxl you around? [00:41] wxl: I can teach packaging stuff to you now [01:12] shadeslayer: You around? [01:29] wxl: Whenever you're ready. [01:48] -kubuntu-ci:#kubuntu-devel- Project merger_kactivitymanagerd build #257: FAILURE in 12 sec: http://kci.pangea.pub/job/merger_kactivitymanagerd/257/ [01:48] -kubuntu-ci:#kubuntu-devel- Project merger_plasma-workspace build #958: FAILURE in 13 sec: http://kci.pangea.pub/job/merger_plasma-workspace/958/ [01:48] -kubuntu-ci:#kubuntu-devel- Project merger_kwin build #997: FAILURE in 21 sec: http://kci.pangea.pub/job/merger_kwin/997/ [01:49] -kubuntu-ci:#kubuntu-devel- Project merger_plasma-pa build #518: FAILURE in 12 sec: http://kci.pangea.pub/job/merger_plasma-pa/518/ [01:49] -kubuntu-ci:#kubuntu-devel- Project merger_discover build #165: FAILURE in 23 sec: http://kci.pangea.pub/job/merger_discover/165/ [01:50] -kubuntu-ci:#kubuntu-devel- Project merger_plasma-nm build #827: FAILURE in 13 sec: http://kci.pangea.pub/job/merger_plasma-nm/827/ [01:50] -kubuntu-ci:#kubuntu-devel- Project merger_plasma-sdk build #649: FAILURE in 11 sec: http://kci.pangea.pub/job/merger_plasma-sdk/649/ [01:50] -kubuntu-ci:#kubuntu-devel- Project merger_kdeplasma-addons build #871: FAILURE in 12 sec: http://kci.pangea.pub/job/merger_kdeplasma-addons/871/ [02:06] -kubuntu-ci:#kubuntu-devel- Project mgmt_pause_integration build #5: ABORTED in 2 hr 0 min: http://kci.pangea.pub/job/mgmt_pause_integration/5/ [02:10] go for it tsimonq2 . didn't see those before [02:11] Ok [02:12] wxl: This will be to show you our workflow [02:12] wxl: So when somebody commits something to one of our branches and it gets pushed, KCI does the following process [02:12] 1. Starts the merger job [02:12] branches = upstream kde, right? [02:12] 2. Starts the appropriate job under zesty, yakkety, or xenial [02:13] No, let me give you an example. [02:13] k [02:13] i'll shaddup [02:13] So in kwin we have the following branches in use: [02:13] - kubuntu_unstable [02:13] - kubuntu_zesty_archive [02:13] - kubuntu_yakkety_archive [02:13] - kubuntu_xenial_archive [02:14] - kubuntu_yakkety_backports [02:14] - kubuntu_xenial_backports [02:14] wxl: So I assume those are fairly obvious? [02:14] yep [02:14] i assume that's generally the branches for every package? [02:15] wxl: So the merger does the following: [02:15] RELEASE_archive -> RELEASE_backports -> RELEASE_stable (currently not set up in KCI but the branch exists) -> kubuntu_unstable [02:15] s/RELEASE_stable/kubuntu_unstable/ [02:16] So let's look at this: http://kci.pangea.pub/job/merger_kwin/997/console [02:16] the arrows mean what exactly? [02:16] The branch gets merged via Git into another [02:16] Hold on, be back in 10 mins, dinner,\ [02:16] Sorry [02:17] k [02:18] wow utopic is still in there? [02:20] obsolete [02:21] why did all the backports fail? [02:21] hold that thought, i'm going to hit the loo [02:23] back [02:28] wxl: Here? [02:28] yp [02:28] tsimonq2: ^^ [02:29] wxl: So the merge job is done before the building of unstable jobs to ensure that we have the latest code [02:29] wxl: Most of the merges that are failing are either things that need to be manually fixed or internal errors [02:29] wxl: Look at my example of kwin [02:30] wxl: So please do git clone git+ssh://wxl@git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kwin -b kubuntu_zesty_archive [02:30] this is a debian/changelog conflict no? [02:30] Correct [02:30] Which is why I picked it [02:31] and not a symbols one :P [02:31] 1s [02:31] So you need to clone the code locally to simulate the merge ;) [02:31] acheronuk: lol [02:32] One sec [02:32] I'll be checking for merge markers in the morning..... [02:32] or at this rate, afternoon! [02:33] joking... anyway. just now very well when this tired [02:33] lol [02:33] Night all :) [02:34] o/ [02:35] k in progress [02:35] um [02:35] hold on [02:35] Yes? [02:36] harumph [02:36] Hold on, quick reboot. [02:36] not sure why but i'm getting permission denied (publickey) [02:37] ah fixed it [02:37] ok got it [02:39] is this because it's UNRELEASED? [02:39] Nope [02:39] Pastebin of the failure please? [02:40] pastebin? you sent the link :) [02:40] Oh I thought you were doing the merge locally [02:41] no [02:41] is that what you intend me to do? [02:41] Checkout kubuntu_unstable please and git merge kubuntu_zesty_archive [02:41] wxl: ^ [02:42] What's that give you? [02:43] http://pastebin.com/g8NfBujn [02:43] so it looks like there are two issues [02:43] unclear if first is just a warning? [02:45] You don't merge zesty_archive in unstable if there is a stable branch [02:46] oic there's some soname bump business thrown into changelog [02:46] zesty_archive merged to kubuntu_unstable merged to kubuntu_unstable [02:46] Well if you inspect the changelog of kubuntu_zesty_archive, then you would see that I removed the whole debian/patches dir about an hour ago. [02:47] Good catch acheronuk [02:47] you merge unstable back to itself? [02:47] you need to mirror the merge cascade KCI is doing to make sure you catch the actual conflict a KCI sees it [02:47] No. Checkout kubuntu_stable, merge kubuntu_zesty_archive into it. Checkout kubuntu_unstable, merge kubuntu_stable into it. [02:47] Yeah/ [02:47] i'm like 100% lost here [02:48] clone the repo [02:48] cd into it [02:48] git checkout kubuntu_zesty_archive [02:49] git checkout kubuntu_stable [02:49] git merge kubuntu_zesty_archive [02:49] git checkout kubuntu_unstable [02:50] git merge kubuntu_stable [02:50] Then solve any conflicts [02:50] wxl: So like I said before. RELEASE_archive -> RELEASE_backports -> kubuntu_stable (currently not set up in KCI but the branch exists) -> kubuntu_unstable [02:51] as that is basically what KCI did, and got the erroe doing so [02:51] Yes. [02:51] ok [02:51] You really don't need to worry about Backports at the moment, as Zesty doesn't have a Backports branch [02:51] right [02:51] So just skip that part [02:51] wxl: You got it now? :) [02:51] yep [02:51] \o/ [02:52] some branches may be missing in some repos, so always look at the KCI merge log to see what it actually did [02:52] then replicate it [02:52] ^ [02:52] In which case this is an easy one [02:52] ok so let's fix ift then? [02:52] yes, no symbols conflicts LP [02:52] :P [02:52] wxl: Don't worry about symbols yet. :P [02:52] Anyways [02:53] * acheronuk goes zzzzzzzzzzzzzzzzzzzzzz [02:53] night [02:53] wxl: So if you would look at the log of kubuntu_zesty_archive, about an hour or so ago, I made a commit removing the debian/patches directory. [02:53] It's irrelevant now because upstream moved it around places. [02:54] So just remove that directory [02:54] oook [02:54] wxl: Then we have the changelog, which is pretty easy to do. [02:54] When merging the changelog, I always make sure to keep all the entries. [02:55] Just so that nothing that someone did is missed. [02:56] In this case, Jose (Santa) has his nametag to those bullet points misplaced, and an extra bullet point. Fix it to look like mine, but keeping all bullet points. :) [02:56] wxl: Make sense? [02:56] 1s [02:57] s/Jose/José/ [02:57] Accents in Spanish are important! :P [02:58] 1s going through this again [03:01] tsimonq2: http://pastebin.com/S7wuA9Ys [03:02] in other words the soname bump needs to be under josé's name [03:03] right? [03:03] Yup [03:03] Correcty [03:03] *Correct [03:03] :P [03:04] uh [03:04] hold on [03:07] wxl: Yes? [03:09] wxl: sup? [03:09] working through it [03:09] Ok. 👍 [03:10] so i aborted the merge [03:10] made sure i checked out unstable [03:11] then i edited changelog [03:11] changelog was a one-person change [03:11] Ok, how does that section look now? [03:12] so i added jose's name to the top [03:12] committed it [03:12] and then merged [03:12] and no dice [03:12] Ok, so kubuntu_unstable is a final stop [03:12] You don't merge kubuntu_unstable into anything else [03:12] oh wait [03:12] am i saying the wrong thing or did i do the wrong thing? [03:13] So after you committed on kubuntu_unstable, what did you do? [03:13] try to merge [03:13] Ok, into what branch? [03:14] into unstable [03:14] so did it wrong [03:14] aborting merge [03:14] resetting hard [03:14] checcking out stable [03:14] You tried to merge kubuntu_unstable into kubuntu_unstable? [03:14] Huh? [03:14] ok now i'm going to add the little brackets [03:14] nonono [03:14] don't worry about it we're back to square one [03:15] Ok [03:15] :) [03:15] wxl: So tell me exactly what you do now. [03:15] We need to catch the issue. ;) [03:16] done [03:16] no issues [03:17] Ok, so WHAT did you do? [03:17] ok so [03:17] 1. clone [03:17] 2. checkout archive [03:17] 3. checkout stable [03:17] 4. remove patches/series [03:17] 5. commit [03:18] Wait you did this in stable? [03:18] 6. remove changelog [03:18] Hold on, what? [03:18] yep [03:18] nonono [03:18] Checkout archive, checkout stable, merge archive, checkout unstable, merge stable [03:18] you told me to remove patches/series, from what i understood, just to make it go [03:18] Well when merging stable into unstable [03:19] i avoided the actual merge because i knew the problem and fixed it before merging [03:19] When there's the merge conflicts and it complains [03:19] Ok, interesting. [03:19] I told you to remove the whole patches dir [03:19] Not just series [03:19] well [03:19] to be frank you were unclear :) [03:19] ok [03:19] let's start over [03:20] 1. Clone [03:20] 2. Checkout archive [03:20] 3. Checkout stable [03:20] 4. git merge archive [03:20] 5. Checkout unstable [03:20] 6. git merge stable [03:20] Solve issues [03:20] Done! [03:21] oh [03:21] i see [03:21] * tsimonq2 nods :) [03:21] not merge fix, then move on, but merge all, then fix [03:21] k [03:21] Yes. :) [03:22] ok [03:22] So? [03:23] fixing [03:23] can't do two separate commits this way because it's in the middle of a merge [03:23] I have a nice (albeit hacky) bash script that does this for me, fwiw. It's just your first time so I'm teaching you. ;) [03:23] Yup, correct. [03:24] i guesss there's no need to be particularly verbose about those changes [03:25] Nope [03:25] merge is complete [03:25] \o/ [03:25] Ok, so one sec, haven't done MPs in a while with this packaging... [03:26] wxl: Run this: git push git+ssh://wxl@git.launchpad.net/~wxl/kubuntu-packaging/+git/kwin kubuntu_unstable [03:27] Then go here: https://code.launchpad.net/~wxl/kubuntu-packaging/+git/kwin [03:27] You should be able to create a merge proposal from there. [03:28] derp [03:28] trying to find out where you can [03:28] ah found it [03:28] under the branch [03:28] https://code.launchpad.net/~wxl/kubuntu-packaging/+git/kwin/+ref/kubuntu_unstable [03:29] So then select the target repository. [03:29] it doesn't just know the target repository? [03:29] Launchpad is weird like that, yeah. [03:29] ~kubutnu-packgers? [03:29] ~kubuntu-packagers/kubuntu-packaging/+git/kwin [03:29] So if you click "Choose..." and you search for "kwin" it should come up [03:29] Yeah [03:29] there copy and paste more better [03:29] and the reference path is / ???? [03:29] Target branch [03:29] Stupid Launchpad :P [03:30] So "kubuntu_unstable" [03:30] ok [03:30] Then describe the change, and put me as a reviewer if you want. [03:30] and a description would represent those changes that you and jose made? [03:30] No, the description would say what you just did. [03:31] i.e. fix changelog and delete debian/patches? [03:31] "I merged from this to that fixing http://kci.pangea.pub/job/merger_kwin/997/console" [03:31] Yup [03:31] Doesn't have to be long. :) [03:31] from zesty_archive/ [03:32] I know what you did and I'll approve it right away, but mail of this goes to kubuntu-devel and we document this sort of thing. ;) [03:32] kubuntu_zesty_archive, yes [03:32] right [03:32] to unstable [03:32] ok [03:32] Yup [03:33] I merged from kubuntu_zesty_archive to kubuntu_unstable, solving http://kci.pangea.pub/job/merger_kwin/997/console [03:33] Had to remove debian/patches and move José's last bulletpoint in the changelog to do so. [03:33] good? [03:33] Hold on. [03:33] sec [03:33] wxl: Cite this: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kwin/commit/?id=7686532fbd041703bda5b08212a5c4262ed67d72 [03:34] Otherwise you're golden. :) [03:35] so that's the commit before [03:35] That's the commit to kubuntu_zesty_archive that justifies removing debian/patches in the merge. [03:35] ok [03:36] proposed [03:37] And then Launchpad is stupid so I have to merge locally... [03:37] yup [03:38] But otherwise, congrats, you just contributed to Kubuntu. :D [03:38] yay [03:38] even more significant than my last contribution to freebsd XD [03:38] XDD [03:38] did i ever show you that one? :) [03:39] No? [03:39] oh let me dig this up [03:40] -kubuntu-ci:#kubuntu-devel- Yippee, build fixed! [03:40] -kubuntu-ci:#kubuntu-devel- Project merger_kwin build #998: FIXED in 22 sec: http://kci.pangea.pub/job/merger_kwin/998/ [03:40] WOOOOOOOO! [03:40] 09:40:29 PM -kubuntu-ci:#kubuntu-devel- Yippee, build fixed! [03:40] 09:40:29 PM -kubuntu-ci:#kubuntu-devel- Project merger_kwin build #998: FIXED in 22 sec: http://kci.pangea.pub/job/merger_kwin/998/ [03:40] (notice) [03:40] wxl: ^^^^^^^^ [03:41] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=202697 [03:41] bugs.freebsd.org bug 202697 in Individual Port(s) "[PATCH] graphics/jasper: Double free corruption in JasPer JPEG-2000 implementation (CVE-2015-5203)" [Affects many people,Closed: fixed] [03:41] it sounds really cool [03:41] but all i did was copy/paste a patch XD [03:41] XD [03:42] wxl: So if you want to sift through http://kci.pangea.pub/view/merge%20FIX/ and find another one to fix, go ahead. :) [03:42] now this is actually my work but the maintainer apparently sucks https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=209349 [03:42] bugs.freebsd.org bug 209349 in Individual Port(s) "www/roundcube: access to this resource is secured against CSRF" [Affects many people,Closed: overcome by events] [03:42] admittedly it's only a change in a couple characters XD [03:42] You now have the process somewhat documented here, so try another one, and ask questions if you have them. ;) [03:43] wxl: lol [03:43] k gimme a sec [03:44] -kubuntu-ci:#kubuntu-devel- Project zesty_unstable_kwin build #15: FAILURE in 3 min 51 sec: http://kci.pangea.pub/job/zesty_unstable_kwin/15/ [03:44] There's a few of these you could do. ;) [03:44] -kubuntu-ci:#kubuntu-devel- Project yakkety_unstable_kwin build #38: STILL FAILING in 3 min 57 sec: http://kci.pangea.pub/job/yakkety_unstable_kwin/38/ [03:44] -kubuntu-ci:#kubuntu-devel- Project xenial_unstable_kwin build #40: FAILURE in 4 min 6 sec: http://kci.pangea.pub/job/xenial_unstable_kwin/40/ [03:44] Ninjas: I have eyes on the kwin FTBFS, install file issues [03:45] looks like discover should be fairly easy [03:45] Yup, try it. :) [03:48] -kubuntu-ci:#kubuntu-devel- Project yakkety_unstable_kwin build #39: STILL FAILING in 3 min 59 sec: http://kci.pangea.pub/job/yakkety_unstable_kwin/39/ [03:48] -kubuntu-ci:#kubuntu-devel- Project xenial_unstable_kwin build #41: STILL FAILING in 3 min 53 sec: http://kci.pangea.pub/job/xenial_unstable_kwin/41/ [03:48] jeez looks like all this is is a newline issue [03:48] llllame [03:48] Yeah I know. [03:48] um [03:48] wait [03:48] I usually can get 10 done within 10 minutes. :P [03:48] -kubuntu-ci:#kubuntu-devel- Project zesty_unstable_kwin build #16: STILL FAILING in 4 min 34 sec: http://kci.pangea.pub/job/zesty_unstable_kwin/16/ [03:49] i have two lines that say new upstream release [03:49] from you [03:49] Pastebin? [03:49] hold on a sec [03:50] http://pastebin.com/qFpDFVzu once it gives me the darn capcha [03:50] there [03:51] O__O [03:51] Thank you, good catch. [03:51] In this case, you know what to do? [03:51] I'll handle the dup changelog entry. [03:51] do the merge, ignoring it, then make a new commit? [03:51] ok if you want all the credit for fixing your mistakes XD [03:52] Well like I said, don't fix it unless you want to make a PR against kubuntu_zesty_archive [03:52] But right now don't fix it [03:52] oh [03:52] k [03:52] Fix it there so it's fixed in two places at once [03:52] got it [03:57] -kubuntu-ci:#kubuntu-devel- Project yakkety_unstable_kwin build #40: STILL FAILING in 3 min 54 sec: http://kci.pangea.pub/job/yakkety_unstable_kwin/40/ [03:57] -kubuntu-ci:#kubuntu-devel- Project zesty_unstable_kwin build #17: STILL FAILING in 3 min 57 sec: http://kci.pangea.pub/job/zesty_unstable_kwin/17/ [03:58] target is which again? [03:58] kubuntu_unstable [03:58] The branch you're merging into [03:58] that's what i thought [03:58] -kubuntu-ci:#kubuntu-devel- Project xenial_unstable_kwin build #42: STILL FAILING in 4 min 47 sec: http://kci.pangea.pub/job/xenial_unstable_kwin/42/ [03:58] Yup. :) [03:59] proposed [04:01] Merged. :) [04:01] doing the clone with the b switch is redundant relative to checking out to archive no? [04:02] Say again? [04:02] -kubuntu-ci:#kubuntu-devel- Yippee, build fixed! [04:02] -kubuntu-ci:#kubuntu-devel- Project merger_discover build #166: FIXED in 23 sec: http://kci.pangea.pub/job/merger_discover/166/ [04:02] git clone … -b kubuntu_zesty_archive [04:02] Oh, yeah. [04:02] Sorry 'bout that. [04:02] np [04:03] wxl: Wanna try fixing kwin in ppa:kubuntu-ppa/staging-plasma? It's super easy, I can show you. ;) [04:03] Or you want to stick to merges? [04:04] hold on i'm almost done with this last one :) [04:05] Alright. :) [04:05] proposed [04:06] wxl: We have notices in here if you don't have them turned on, they show build failures and fixes. [04:06] oh yeah [04:06] -kubuntu-ci:#kubuntu-devel- Project xenial_unstable_discover build #41: STILL FAILING in 4 min 26 sec: http://kci.pangea.pub/job/xenial_unstable_discover/41/ [04:06] let me sift through my ignores :) [04:07] wxl: See my response to your MP [04:07] I would delete it. [04:08] ugh hold on [04:09] ugh [04:09] launchpad [04:09] ikr [04:10] what's terribel is if you choose a new target, it doesn't auto select it [04:10] that was the problem [04:10] Well let's see. ;) [04:10] would it be instructivbe to fix that double changelog entry/ [04:10] Yup, doing. [04:11] well i mean let me do it? :) [04:11] Oh sure. :) [04:11] Yup. :) [04:11] so where do i grab this from? [04:12] same place? [04:12] Yup [04:12] since merged go to archive [04:12] fix then commit and push? [04:12] -kubuntu-ci:#kubuntu-devel- Project yakkety_unstable_discover build #32: STILL UNSTABLE in 10 min: http://kci.pangea.pub/job/yakkety_unstable_discover/32/ [04:12] Yup [04:13] -kubuntu-ci:#kubuntu-devel- Project zesty_unstable_discover build #26: STILL UNSTABLE in 11 min: http://kci.pangea.pub/job/zesty_unstable_discover/26/ [04:14] uh [04:14] it's gone [04:14] -kubuntu-ci:#kubuntu-devel- Yippee, build fixed! [04:14] -kubuntu-ci:#kubuntu-devel- Project merger_kactivitymanagerd build #258: FIXED in 18 sec: http://kci.pangea.pub/job/merger_kactivitymanagerd/258/ [04:14] -kubuntu-ci:#kubuntu-devel- Project xenial_unstable_discover build #42: STILL FAILING in 4 min 23 sec: http://kci.pangea.pub/job/xenial_unstable_discover/42/ [04:14] What are you doing? Which repo? [04:15] oh [04:15] that was discover [04:15] derp [04:16] weird pulls don't work on all branches??? [04:16] ah you fixed it you bastard [04:17] :P [04:17] much anger [04:17] alright let's move on [04:17] kactivitymanagerd still needs doing. :) [04:17] oh [04:21] -kubuntu-ci:#kubuntu-devel- Project xenial_unstable_kactivitymanagerd build #135: STILL UNSTABLE in 6 min 59 sec: http://kci.pangea.pub/job/xenial_unstable_kactivitymanagerd/135/ [04:22] now what? [04:22] -kubuntu-ci:#kubuntu-devel- Project yakkety_unstable_discover build #33: STILL UNSTABLE in 9 min 35 sec: http://kci.pangea.pub/job/yakkety_unstable_discover/33/ [04:22] -kubuntu-ci:#kubuntu-devel- Project yakkety_unstable_kactivitymanagerd build #123: STILL UNSTABLE in 7 min 58 sec: http://kci.pangea.pub/job/yakkety_unstable_kactivitymanagerd/123/ [04:22] -kubuntu-ci:#kubuntu-devel- Project zesty_unstable_kactivitymanagerd build #13: STILL UNSTABLE in 8 min 0 sec: http://kci.pangea.pub/job/zesty_unstable_kactivitymanagerd/13/ [04:23] wxl: I'll merge it [04:23] yeha that's old hat [04:23] on to the next thing :) [04:23] So you see this? https://launchpad.net/~kubuntu-ppa/+archive/ubuntu/staging-plasma/+packages?field.name_filter=&field.status_filter=published&field.series_filter=zesty [04:24] We're putting Plasma 5.8.3 in our Staging Plasma PPa. [04:24] *PPA [04:24] We do this before putting it in Backports Landing or the Archive. [04:24] This way we can solve any problems that may arise. [04:24] wxl: In this case, the kwin failure is an easy fix. [04:25] So we're going to look into that. [04:25] This is basic packaging, so you'll learn something. ;) [04:25] k [04:25] wxl: So take a look at this: https://launchpadlibrarian.net/292995522/buildlog_ubuntu-zesty-amd64.kwin_4%3A5.8.3-0ubuntu1~ubuntu17.04~ppa1_BUILDING.txt.gz [04:25] Tell me in your own words what the problem is. [04:26] -kubuntu-ci:#kubuntu-devel- Project zesty_unstable_discover build #27: STILL UNSTABLE in 13 min: http://kci.pangea.pub/job/zesty_unstable_discover/27/ [04:27] (If you can figure it out. ;) ) [04:28]