The restructuring surely has an impact on the release build process (basically it becomes a lot easier). We should probably branch off AFTER the
restructuring in order to make it easier to merge commits to both the 1.0.x branch as well as master (or any other branch created after the restructuring for that matter). So it looks like it comes down to branching off of master’s HEAD
J
From: cf-dev-bounces@xxxxxxxxxxx
[mailto:cf-dev-bounces@xxxxxxxxxxx] On Behalf Of Simon Bernard
Sent: Tuesday, February 02, 2016 3:42 PM
To: Californium (Cf) developer discussions
Subject: Re: [cf-dev] Branching strategy
I think we should create the branch after unification.
But I don't follow the stucture modification which has been done after it. So I'm not sure to know if we must create the branch before the refactoring or after. (I don't know if this has an impact to the release hudson task too)
Le 02/02/2016 15:06, Hudalla Kai (INST/ESY1) a écrit :
It’s good that you keep suspicious, Simon
J That doesn’t seem to make much sense, does it? So we should probably branch off after
unification, right?
Ok I relaunched the hudson job and it's ok now.
Sry, still not clear for me, you want to create the branch 1.0.x from the 1.0.1 tag ? this mean before the unification ?
Le 02/02/2016 14:36, Hudalla Kai (INST/ESY1) a écrit :
No, I meant creating the 1.0.x branch off of tag 1.0.1. Sorry for being unclear …
I think the Californium build is in general not very stable, i.e. it seems to have a race condition in the tests somewhere.
If you simply trigger the build again, I am pretty sure it will succeed …
I just merge the PR in master, but hudson doesn't really like me today, I accumulate job failure (first Leshan and now Californium ...)... however I check it locally each time ...
I will investigate that.
What did you mean by create 1.0.2 ? did you mean release the version ?
Le 02/02/2016 14:11, Hudalla Kai (INST/ESY1) a écrit :
Oh, of course, I totally forgot about that.
However, I would like to get into the habit of using the different branches for this purpose and therefore would propose
to create the 1.0.x branch off of 1.0.1 now. We can then merge the PR to that branch and master as well. We can then decide to release 1.0.2 whenever we feel we are ready without interfering with any work going on on master or any other branch …
@Simon: can you create 1.0.2 and merge PR #2?
We need a 1.0.2 soon because of this bug :
https://github.com/eclipse/californium/pull/2.
Maybe we can integrate it and release it just before the branch creation.
Le 02/02/2016 08:51, Hudalla Kai (INST/ESY1) a écrit :
Matthias,
I have started to work on some features I think should go into 1.1 (and 2.0 of course). So I am definitely with you
regarding creation of the branches.
I think we can defer creation of 1.0.x (off of tag 1.0.1) to the time we have a need for creating 1.0.2.
However, I think we should be able to target 1.1 for maybe April/May? We also need to work on the roadmap for that
matter and publish it on the project web site which brings us back to the web site issue ;-)
Hi all
Now that we merged, we should create the branches. From the thread, I am not sure if this is now for what we are going:
·
hotfix-1.0.x
·
master-1.x
·
master-2.x
Kai, did you already start your 1.x work?
To slowly get the updated to Actinium published, I started a master-2.x there:
https://github.com/eclipse/californium.actinium/tree/master-2.x
Apparently, we have to go through webmaster to set the default branch and also update the repo descriptions.
Ciao
Matthias
_______________________________________________
cf-dev mailing list
cf-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/cf-dev
_______________________________________________
cf-dev mailing list
cf-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/cf-dev
_______________________________________________
cf-dev mailing list
cf-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/cf-dev
_______________________________________________
cf-dev mailing list
cf-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/cf-dev
|
