GitLab Release Group, 15 Dec 2019

Previous Meeting Next Meeting

⏯

youtube image

►

From YouTube: Squash and Merge for Merge Trains Demo

Description

Demo for supporting Squash and Merge for Merge Trains https://gitlab.com/gitlab-org/gitlab/issues/13001 as part of progressive delivery group in the Release stage

A

Let's get started suppose squash Toronto March in my strain.

A

So do everyone know that, what's this issue about it's just like support squash commits this option in a much train cycle. So, let's taking a look at how it works.

A

Okay, so here's a demo projects and we have a very simple pipeline gillip a CMO is it has only one job and then it's enabled a pipelines for much much requests so I know so. I've enabled much strain on this project. So what user creates a much request? They can put it on much strain now. Let's try to create Marcus.

A

I'm creating now mantra is.

A

1K smartFocus 1 and since it's training, I'm gonna create a mushrik as two as well I'm gonna edit. What every file.

A

Okay, here get to module requests in this project. This is up. The readme. Amd is much Lucas one and then this changelog Markus is America's number two and it boasts multiple keys are not much string. Yet it's yeah it's running much without the pipeline. So at first we have to finish these pipelines.

A

I'm gonna internally finish these pipelines.

A

Now, I'm, sorry, sorry for that one step, since we enable squash comets this each markets needs to have more than one commit. So here we have only one commit right. We need to create two comets.

A

I'm going to create a new comment as well.

A

Okay, now both markets have two comets and then let's, let's finish this Marcel pipeline.

A

Okay, now we are ready. So, as you can see like, we are seeing start mushroom bottom. So this we are ready to put this much focus in the train, but also we see that squash comes option s near bonus and then put in on my shrine this markets as well.

A

Like it previously, when user enabled squash option, the magic request immediately dropped from much rain, but today they can enable it and.

A

Yes, his modulus 1 and module caste is my showcase has already started much much shrimp, a plane, yes, I, think I don't need to explain about much during pipeline, but bit mushroom price pipelines are basically based on cascading riff. So this much pipeline train pipeline is based on the latest master Branca lists latest target Blanche and Marcus one commit how much Vegas one change and then much Ricky's teas mushroom pipeline is based on latest muscle. Branch at a must must biggest ones change and module gets to the changing.

A

So like it's this of the cascading, the refs. Well, it's not really involved with this squash support, but yeah. It is what it is. Ok,.

B

Now, yes, I think Rick's, quick question: I saw you didn't merge, squashing merge on both of those does it? Is it work? Fine, if like one of them is not a squash, merge commit, and the other is of course yes.

A

It's working as today: okay, thanks! Yes, then now we have, let's finish these pipelines our expects. Our expectation is that once these pipelines finished, this much workers should be merged into the master branch with squash option.

A

So let's finish this marvelous once pipeline.

A

Okay, as we finished this moderate much for applying this mantra, kiss has been merged as this is expected and it is marvelous to you still it's waiting, my stream pipeline. So let's finish this as well.

A

It's yes, as we finished it's being marched, and now it has to be emerged. So the important thing is that the comic is recently in target branch in our case master branch. So now we are seeing master branch connect easily and this Mars branch feature for one. Was this marvelous one? And then this disco mating creature, forward to ink master I was interest by Marcus du marché and these are much commits and then, if user didn't use, squash option that all of calmed history it Shawn under this like, and it is Marsh branch.

A

Whatever message like, we made a to commit sin update, readme right there with me, like this char and the disco, but since the system squash is too much to comets into one comment user only seeing this one one commit this is the squash to commit.

A

So yes, as you can see, we don't see like to say Pollock comets in the must master branch history right. So it means that squash has been properly executed. And then my friend had squashed the comics history and then I reflected in master history.