Hi all,
I see the point of Chris but I think for now what Glaucia proposes makes sense.
So having the main as the default and develop branch simplifies things a lot.
We can rethink this later if we are using more branches.
Best
--
Zoi
Στις Τετάρτη 1 Νοεμβρίου 2023 στις 07:39:12 π.μ. CET, ο χρήστης Christofer
Dutz <[email protected]> έγραψε:
Just because many projects do something, dient realy make it good though.
There are a lot of things I am seeing at many apache projects that are not
worth copying.
Actually you'll probably find examples for everything here and if you ask me:
the older the project, the worse it is as example.
If there's only one branch (no general release branch), I think main could stay
the develop branch, but as soon as there's one I strongly suggest to use
"develop" and "release".
Chris
Gesendet von Outlook für Android<https://aka.ms/AAb9ysg>
________________________________
From: Gláucia Esppenchutz <[email protected]>
Sent: Wednesday, November 1, 2023 12:37:17 AM
To: [email protected] <[email protected]>
Subject: Re: [DISCUSSION] Wayang branch strategy
Hi everyone!
I am bringing up this discussion to ask if we can simplify the strategy
based on some conversations I had with other committers in the last CoC:
- Update the "main" branch with the latest pom files and use it as a branch
to merge all PRs, and not change the name to "release".
- Disregard the "develop".
Most Apache (Airflow, e.g.) repos use the "main" branch to merge all PRs
and as the default branch. This can simplify for newcomers from other
projects or that read some documentation guidelines. Based on this, we can
disregard the "develop" branch.
By the end of the day, we would have:
"main" -> used to create new features and generate the release
"cherry-pick" -> A temporary branch based on "main," created on the release
process to select only the required and stable features to be released.
"rel/x.x.x" -> The official release branch with the current tag. Here will
be generated the artifacts and so on.
"feat/bug" -> a friendly convention we can use to guide the creation of new
features or bug fixes
Let me know if you all agree with this :)
Em ter., 3 de out. de 2023 às 09:53, Gláucia Esppenchutz <[email protected]>
escreveu:
> Hi everyone,
>
> Sorry for the late reply.
> I will start to apply these changes when I come back from the CoC in
> Halifax :)
>
> Em qua., 20 de set. de 2023 às 16:19, Jean-Baptiste Onofré <
> [email protected]> escreveu:
>
>> +1
>>
>> Thanks ! It looks good to me.
>>
>> Regards
>> JB
>>
>> On Tue, Sep 19, 2023 at 5:15 PM Gláucia Esppenchutz
>> <[email protected]> wrote:
>> >
>> > Hi everyone,
>> >
>> > I was thinking about using the git-flow model of branching strategy.
>> More
>> > or less having the following branches:
>> > "main" renamed to "release"
>> > "rel/x.x.x"
>> > "cherry-pick"
>> > "develop"
>> > "feat/bug"
>> > Here, we would use the "release" as the current stable state from
>> Wayang.
>> > The "release" would have the same content as the latest "rel/x.x.x"
>> branch.
>> >
>> > About the "rel/x.x.x", the ideal would be to keep track of all versions
>> we
>> > have, and if anyone needs to use an older version, it will be there
>> > (likewise the tag).
>> > The "develop" branch would be where we merge the approved PRs, and it
>> may
>> > not be stable since we are always opening and merging new content. To
>> work
>> > on a new feature, we would ask the developer to create a new
>> > "feature/bugfix" from the "develop" branch and work there.
>> >
>> > After we decided we were ready to make a new release, we would pick the
>> > features and fixes implemented on "develop" and cherry-pick them in a
>> > specific branch called "cherry-pick" (so innovative). After doing some
>> > testing and making sure we are able to compile and meet the Apache
>> guides,
>> > we will proceed to create the "rel/" branch by maven commands.
>> >
>> > Once the "rel/" conforms with Apache approvals, the content would be
>> then
>> > merged into "release" (default branch), so developers who want to use
>> > Wayang have an easy and intuitive way to find the latest and stable
>> version.
>> >
>> > What do you think? :)
>>
>
>
> --
> Gláucia Esppenchutz
>
> -----------------------------------------------------
> Twitter: @lyuric19
> Linkedin: https://br.linkedin.com/pub/gláucia-esppenchutz/47/81a/312
>
--
Gláucia Esppenchutz
-----------------------------------------------------
Twitter: @lyuric19
Linkedin: https://br.linkedin.com/pub/gláucia-esppenchutz/47/81a/312
