Preparing the 7.0 release (and 8.0 open), we will need to rename "development" branch to "dev-7.0"
Hi list, Well, subject says pretty much all. We are planning to release Pharo 7.0 very soon now, and while preparing the release process, we came to the conclusion that we will need a branch for version to develop, and because of that we will need to rename what is not âdevelopmentâ to âdev-7.0â. Then, it will be a âdev-8.0â and so on⦠So, be prepared to submit your PRs to dev-7.0 instead development :) Cheers, Esteban
Hi, Should we submit PR concerning non-stabilisation changes (like refactoring or new features) to another branch like dev-8.0 then? Cheers, Julien --- Julien Delplanque Doctorant à lâUniversité de Lille http://juliendelplanque.be/phd.html Equipe Rmod, Inria Bâtiment B 40, Avenue Halley 59650 Villeneuve d'Ascq Numéro de téléphone: +333 59 35 86 40
Le 22 nov. 2018 à 11:40, Esteban Lorenzano <estebanlm@gmail.com> a écrit :
Hi list,
Well, subject says pretty much all. We are planning to release Pharo 7.0 very soon now, and while preparing the release process, we came to the conclusion that we will need a branch for version to develop, and because of that we will need to rename what is not âdevelopmentâ to âdev-7.0â. Then, it will be a âdev-8.0â and so onâ¦
So, be prepared to submit your PRs to dev-7.0 instead development :)
Cheers, Esteban
Once we open dev-8.0, yes :) Esteban
On 22 Nov 2018, at 11:51, Julien <julien.delplanque@inria.fr> wrote:
Hi,
Should we submit PR concerning non-stabilisation changes (like refactoring or new features) to another branch like dev-8.0 then?
Cheers,
Julien
--- Julien Delplanque Doctorant à lâUniversité de Lille http://juliendelplanque.be/phd.html <http://juliendelplanque.be/phd.html> Equipe Rmod, Inria Bâtiment B 40, Avenue Halley 59650 Villeneuve d'Ascq Numéro de téléphone: +333 59 35 86 40
Le 22 nov. 2018 à 11:40, Esteban Lorenzano <estebanlm@gmail.com <mailto:estebanlm@gmail.com>> a écrit :
Hi list,
Well, subject says pretty much all. We are planning to release Pharo 7.0 very soon now, and while preparing the release process, we came to the conclusion that we will need a branch for version to develop, and because of that we will need to rename what is not âdevelopmentâ to âdev-7.0â. Then, it will be a âdev-8.0â and so onâ¦
So, be prepared to submit your PRs to dev-7.0 instead development :)
Cheers, Esteban
Cool, thanks for all this work ! :-) Julien --- Julien Delplanque Doctorant à lâUniversité de Lille http://juliendelplanque.be/phd.html Equipe Rmod, Inria Bâtiment B 40, Avenue Halley 59650 Villeneuve d'Ascq Numéro de téléphone: +333 59 35 86 40
Le 22 nov. 2018 à 12:00, Esteban Lorenzano <estebanlm@gmail.com> a écrit :
Once we open dev-8.0, yes :)
Esteban
On 22 Nov 2018, at 11:51, Julien <julien.delplanque@inria.fr <mailto:julien.delplanque@inria.fr>> wrote:
Hi,
Should we submit PR concerning non-stabilisation changes (like refactoring or new features) to another branch like dev-8.0 then?
Cheers,
Julien
--- Julien Delplanque Doctorant à lâUniversité de Lille http://juliendelplanque.be/phd.html <http://juliendelplanque.be/phd.html> Equipe Rmod, Inria Bâtiment B 40, Avenue Halley 59650 Villeneuve d'Ascq Numéro de téléphone: +333 59 35 86 40
Le 22 nov. 2018 à 11:40, Esteban Lorenzano <estebanlm@gmail.com <mailto:estebanlm@gmail.com>> a écrit :
Hi list,
Well, subject says pretty much all. We are planning to release Pharo 7.0 very soon now, and while preparing the release process, we came to the conclusion that we will need a branch for version to develop, and because of that we will need to rename what is not âdevelopmentâ to âdev-7.0â. Then, it will be a âdev-8.0â and so onâ¦
So, be prepared to submit your PRs to dev-7.0 instead development :)
Cheers, Esteban
Hi, Why not following git flow? Keep the development branch for dev and open a 70-release branch to prepare the release. This way, there is no change for most people. Christophe
Le 22 nov. 2018 à 11:40, Esteban Lorenzano <estebanlm@gmail.com> a écrit :
Hi list,
Well, subject says pretty much all. We are planning to release Pharo 7.0 very soon now, and while preparing the release process, we came to the conclusion that we will need a branch for version to develop, and because of that we will need to rename what is not âdevelopmentâ to âdev-7.0â. Then, it will be a âdev-8.0â and so onâ¦
So, be prepared to submit your PRs to dev-7.0 instead development :)
Cheers, Esteban
On 22 Nov 2018, at 12:48, Christophe Demarey <Christophe.Demarey@inria.fr> wrote:
Hi,
Why not following git flow? Keep the development branch for dev and open a 70-release branch to prepare the release. This way, there is no change for most people.
Because our scripts are automated in branch and tag basis. dev-7.0 will generate SNAPSHOT versions for files.pharo.org/70 <http://files.pharo.org/70> and tags (v7.0.0-rc1, for example) will generate a release. We could have another flow, but this was what we decided last week and we will try it (maybe this is wrong and we will need to change it, but well⦠weâll see⦠good part of having a process is that we can iterate on it :P) Esteban
Christophe
Le 22 nov. 2018 à 11:40, Esteban Lorenzano <estebanlm@gmail.com> a écrit :
Hi list,
Well, subject says pretty much all. We are planning to release Pharo 7.0 very soon now, and while preparing the release process, we came to the conclusion that we will need a branch for version to develop, and because of that we will need to rename what is not âdevelopmentâ to âdev-7.0â. Then, it will be a âdev-8.0â and so onâ¦
So, be prepared to submit your PRs to dev-7.0 instead development :)
Cheers, Esteban
On 22 Nov 2018, at 13:21, Esteban Lorenzano <estebanlm@gmail.com> wrote:
On 22 Nov 2018, at 12:48, Christophe Demarey <Christophe.Demarey@inria.fr <mailto:Christophe.Demarey@inria.fr>> wrote:
Hi,
Why not following git flow? Keep the development branch for dev and open a 70-release branch to prepare the release. This way, there is no change for most people.
Because our scripts are automated in branch and tag basis. dev-7.0 will generate SNAPSHOT versions for files.pharo.org/70 <http://files.pharo.org/70> and tags (v7.0.0-rc1, for example) will generate a release.
We could have another flow, but this was what we decided last week and we will try it (maybe this is wrong and we will need to change it, but well⦠weâll see⦠good part of having a process is that we can iterate on it :P)
Btw, Iâm not complete happy with this either: as it is previewed now, there will not be stable branch, and I feel this is incorrect. But again⦠good thing is we can iterate, weâll see if this works. Esteban
Esteban
Christophe
Le 22 nov. 2018 à 11:40, Esteban Lorenzano <estebanlm@gmail.com <mailto:estebanlm@gmail.com>> a écrit :
Hi list,
Well, subject says pretty much all. We are planning to release Pharo 7.0 very soon now, and while preparing the release process, we came to the conclusion that we will need a branch for version to develop, and because of that we will need to rename what is not âdevelopmentâ to âdev-7.0â. Then, it will be a âdev-8.0â and so onâ¦
So, be prepared to submit your PRs to dev-7.0 instead development :)
Cheers, Esteban
Le 22 nov. 2018 à 13:25, Esteban Lorenzano <estebanlm@gmail.com> a écrit :
On 22 Nov 2018, at 13:21, Esteban Lorenzano <estebanlm@gmail.com <mailto:estebanlm@gmail.com>> wrote:
On 22 Nov 2018, at 12:48, Christophe Demarey <Christophe.Demarey@inria.fr <mailto:Christophe.Demarey@inria.fr>> wrote:
Hi,
Why not following git flow? Keep the development branch for dev and open a 70-release branch to prepare the release. This way, there is no change for most people.
Because our scripts are automated in branch and tag basis. dev-7.0 will generate SNAPSHOT versions for files.pharo.org/70 <http://files.pharo.org/70> and tags (v7.0.0-rc1, for example) will generate a release.
maybe not for now but we can update the scripts to check: - master branch => release (only release tags there) - development branch => snapshot - release branch => snapshots or realease (rcx) if a tag is defined - all other branches => do nothing
We could have another flow, but this was what we decided last week and we will try it (maybe this is wrong and we will need to change it, but well⦠weâll see⦠good part of having a process is that we can iterate on it :P)
Btw, Iâm not complete happy with this either: as it is previewed now, there will not be stable branch, and I feel this is incorrect. But again⦠good thing is we can iterate, weâll see if this works.
we could use the master branch for that => commits to master are only merges from release branches and hotfix branches.
Ok, a new pass onto this, I decided that having just dev-Etc. branches and not having a clear stable one may lead to confusion. After checking some projects on GitHub, seems that what they do is to name their branches just with the version, not with âdevâ (like, for example "gtk-2.22â). So, I will name the version based branchs âPharo7.0â, âPharo8.0â and so on. (Without dash to keep coherence with the artefact naming) Cheers! Esteban
On 22 Nov 2018, at 13:25, Esteban Lorenzano <estebanlm@gmail.com> wrote:
On 22 Nov 2018, at 13:21, Esteban Lorenzano <estebanlm@gmail.com <mailto:estebanlm@gmail.com>> wrote:
On 22 Nov 2018, at 12:48, Christophe Demarey <Christophe.Demarey@inria.fr <mailto:Christophe.Demarey@inria.fr>> wrote:
Hi,
Why not following git flow? Keep the development branch for dev and open a 70-release branch to prepare the release. This way, there is no change for most people.
Because our scripts are automated in branch and tag basis. dev-7.0 will generate SNAPSHOT versions for files.pharo.org/70 <http://files.pharo.org/70> and tags (v7.0.0-rc1, for example) will generate a release.
We could have another flow, but this was what we decided last week and we will try it (maybe this is wrong and we will need to change it, but well⦠weâll see⦠good part of having a process is that we can iterate on it :P)
Btw, Iâm not complete happy with this either: as it is previewed now, there will not be stable branch, and I feel this is incorrect. But again⦠good thing is we can iterate, weâll see if this works.
Esteban
Esteban
Christophe
Le 22 nov. 2018 à 11:40, Esteban Lorenzano <estebanlm@gmail.com <mailto:estebanlm@gmail.com>> a écrit :
Hi list,
Well, subject says pretty much all. We are planning to release Pharo 7.0 very soon now, and while preparing the release process, we came to the conclusion that we will need a branch for version to develop, and because of that we will need to rename what is not âdevelopmentâ to âdev-7.0â. Then, it will be a âdev-8.0â and so onâ¦
So, be prepared to submit your PRs to dev-7.0 instead development :)
Cheers, Esteban
Ah, I forget to say that this change we enter in effect today :) May the force be with us. Esteban
On 28 Nov 2018, at 12:25, Esteban Lorenzano <estebanlm@gmail.com> wrote:
Ok, a new pass onto this, I decided that having just dev-Etc. branches and not having a clear stable one may lead to confusion. After checking some projects on GitHub, seems that what they do is to name their branches just with the version, not with âdevâ (like, for example "gtk-2.22â).
So, I will name the version based branchs âPharo7.0â, âPharo8.0â and so on.
(Without dash to keep coherence with the artefact naming)
Cheers! Esteban
On 22 Nov 2018, at 13:25, Esteban Lorenzano <estebanlm@gmail.com <mailto:estebanlm@gmail.com>> wrote:
On 22 Nov 2018, at 13:21, Esteban Lorenzano <estebanlm@gmail.com <mailto:estebanlm@gmail.com>> wrote:
On 22 Nov 2018, at 12:48, Christophe Demarey <Christophe.Demarey@inria.fr <mailto:Christophe.Demarey@inria.fr>> wrote:
Hi,
Why not following git flow? Keep the development branch for dev and open a 70-release branch to prepare the release. This way, there is no change for most people.
Because our scripts are automated in branch and tag basis. dev-7.0 will generate SNAPSHOT versions for files.pharo.org/70 <http://files.pharo.org/70> and tags (v7.0.0-rc1, for example) will generate a release.
We could have another flow, but this was what we decided last week and we will try it (maybe this is wrong and we will need to change it, but well⦠weâll see⦠good part of having a process is that we can iterate on it :P)
Btw, Iâm not complete happy with this either: as it is previewed now, there will not be stable branch, and I feel this is incorrect. But again⦠good thing is we can iterate, weâll see if this works.
Esteban
Esteban
Christophe
Le 22 nov. 2018 à 11:40, Esteban Lorenzano <estebanlm@gmail.com <mailto:estebanlm@gmail.com>> a écrit :
Hi list,
Well, subject says pretty much all. We are planning to release Pharo 7.0 very soon now, and while preparing the release process, we came to the conclusion that we will need a branch for version to develop, and because of that we will need to rename what is not âdevelopmentâ to âdev-7.0â. Then, it will be a âdev-8.0â and so onâ¦
So, be prepared to submit your PRs to dev-7.0 instead development :)
Cheers, Esteban
On 28 Nov 2018, at 12:25, Esteban Lorenzano <estebanlm@gmail.com> wrote:
Ah, I forget to say that this change we enter in effect today :)
Ok, maybe tomorrow since I needed to refresh my groovy knowledge ;) Esteban
May the force be with us.
Esteban
On 28 Nov 2018, at 12:25, Esteban Lorenzano <estebanlm@gmail.com <mailto:estebanlm@gmail.com>> wrote:
Ok, a new pass onto this, I decided that having just dev-Etc. branches and not having a clear stable one may lead to confusion. After checking some projects on GitHub, seems that what they do is to name their branches just with the version, not with âdevâ (like, for example "gtk-2.22â).
So, I will name the version based branchs âPharo7.0â, âPharo8.0â and so on.
(Without dash to keep coherence with the artefact naming)
Cheers! Esteban
On 22 Nov 2018, at 13:25, Esteban Lorenzano <estebanlm@gmail.com <mailto:estebanlm@gmail.com>> wrote:
On 22 Nov 2018, at 13:21, Esteban Lorenzano <estebanlm@gmail.com <mailto:estebanlm@gmail.com>> wrote:
On 22 Nov 2018, at 12:48, Christophe Demarey <Christophe.Demarey@inria.fr <mailto:Christophe.Demarey@inria.fr>> wrote:
Hi,
Why not following git flow? Keep the development branch for dev and open a 70-release branch to prepare the release. This way, there is no change for most people.
Because our scripts are automated in branch and tag basis. dev-7.0 will generate SNAPSHOT versions for files.pharo.org/70 <http://files.pharo.org/70> and tags (v7.0.0-rc1, for example) will generate a release.
We could have another flow, but this was what we decided last week and we will try it (maybe this is wrong and we will need to change it, but well⦠weâll see⦠good part of having a process is that we can iterate on it :P)
Btw, Iâm not complete happy with this either: as it is previewed now, there will not be stable branch, and I feel this is incorrect. But again⦠good thing is we can iterate, weâll see if this works.
Esteban
Esteban
Christophe
Le 22 nov. 2018 à 11:40, Esteban Lorenzano <estebanlm@gmail.com <mailto:estebanlm@gmail.com>> a écrit :
Hi list,
Well, subject says pretty much all. We are planning to release Pharo 7.0 very soon now, and while preparing the release process, we came to the conclusion that we will need a branch for version to develop, and because of that we will need to rename what is not âdevelopmentâ to âdev-7.0â. Then, it will be a âdev-8.0â and so onâ¦
So, be prepared to submit your PRs to dev-7.0 instead development :)
Cheers, Esteban
participants (4)
-
Christophe Demarey -
Esteban Lorenzano -
Julien -
Stephan Eggermont