Since the next robotics season is approaching I would like to do an xpcc release next week. The name will be `2013` since we are probably going to do annual releases. If we want to do more frequent releases we can add a number (maybe a MINOR and PATCH version) or q1-q4 if we ever want to do quarterly releases. For the release I want to do the following things: 1.) Tag the current master branch as `2012` and then release this version via [github](https://github.com/blog/1547-release-your-software). Does anyone have any thoughts on release notes? 2.) Merge master into develop. 3.) Merge develop into master. 4.) Tag master as `2013` and release via github. Any thoughts on release notes? 5.) Merge _feature/experimental_structure_ into develop. 6.) Delete _feature/experimental_structure_ branch. For the remaining branches I have the following plans: * _feature/tcpip_communication_: rebase on top of the new _develop_ branch. * _feature/stm32_spi_slave_: add SPI Slave code manually to our new develop (I'm working on new SPI code for STM32 at the moment so it might already be on the _experimental_structure_ branch when we do our release). Cherry-pick example projects created on this branch. Then delete. * _feature/display_menu_structure_: this was planed to be included in the `2013` release but will not be ready in time. Thus rebase on top of the new _develop_. * _feature/stellaris_lm4f_support_: keep around because it will be usefull should we ever decide to add LM4F support to xpcc. Since TI has been quick to discontinued this line of uCs it is not certain if we ever will. So does anyone have any comments on this? If not I'll try to do the release together with Niklas probably on Tuesday.
Hi, concerning the feature branch display_menu_structure, we should test it with the hardware of our last robot, so if everything works, we can test it on Tuesday and include it in the release. Concerning my tcpip branch, i will need some more time, so we can probably include it in the next release, which should be a minor release, because we will use it for the robot simulator as soon as it is working. Best Regards, Thorsten On 27.09.2013 16:59, Kevin Laeufer wrote:
Since the next robotics season is approaching I would like to do an xpcc release next week. The name will be `2013` since we are probably going to do annual releases. If we want to do more frequent releases we can add a number (maybe a MINOR and PATCH version) or q1-q4 if we ever want to do quarterly releases.
For the release I want to do the following things: 1.) Tag the current master branch as `2012` and then release this version via [github](https://github.com/blog/1547-release-your-software). Does anyone have any thoughts on release notes? 2.) Merge master into develop. 3.) Merge develop into master. 4.) Tag master as `2013` and release via github. Any thoughts on release notes? 5.) Merge _feature/experimental_structure_ into develop. 6.) Delete _feature/experimental_structure_ branch.
For the remaining branches I have the following plans: * _feature/tcpip_communication_: rebase on top of the new _develop_ branch.
* _feature/stm32_spi_slave_: add SPI Slave code manually to our new develop (I'm working on new SPI code for STM32 at the moment so it might already be on the _experimental_structure_ branch when we do our release). Cherry-pick example projects created on this branch. Then delete.
* _feature/display_menu_structure_: this was planed to be included in the `2013` release but will not be ready in time. Thus rebase on top of the new _develop_.
* _feature/stellaris_lm4f_support_: keep around because it will be usefull should we ever decide to add LM4F support to xpcc. Since TI has been quick to discontinued this line of uCs it is not certain if we ever will.
So does anyone have any comments on this? If not I'll try to do the release together with Niklas probably on Tuesday. _______________________________________________ xpcc-dev mailing list xpcc-dev@lists.rwth-aachen.de http://mailman.rwth-aachen.de/mailman/listinfo/xpcc-dev
Hi Thorsten, On 09/27/2013 07:07 PM, Thorsten Lajewski wrote:
concerning the feature branch display_menu_structure, we should test it with the hardware of our last robot, so if everything works, we can test it on Tuesday and include it in the release.
I know. Bit I do not know if we will be able to fully test tour code on Tuesday. Since the branch is going to be handed over to a knew maintainer I'd prefer if we did not include it with the 2013 release. As we agreed last Tuesday, this branch will not be a blocker since it is not required for any of our last seasons code.
Concerning my tcpip branch, i will need some more time, so we can probably include it in the next release, which should be a minor release, because we will use it for the robot simulator as soon as it is working.
I think we will be compiling this season's code against the `develop` branch. Next summer the new code will be tested an we can release again. So just merge your tcp/ip branch into develop as soon as you are done. Since feature/experimental_structure will become the new develop we need to rebase your branch on top of it soon. But there is no hurry. Just tell we when you have time after the release and we can rebase the stuff "together" via Jabber. Kevin
Hi, i'll be in our room this tuesday, and i'm confident that we will be able to test it. The code is mostly ported from our last years display, so there will only be few changes needed for our last seasons code to compile with the xpcc code. But we can see this on Tuesday. If we will not finish the test we can include it in a later release. Best Regards, Thorsten On 27.09.2013 19:14, Kevin Laeufer wrote:
Hi Thorsten,
On 09/27/2013 07:07 PM, Thorsten Lajewski wrote:
concerning the feature branch display_menu_structure, we should test it with the hardware of our last robot, so if everything works, we can test it on Tuesday and include it in the release.
I know. Bit I do not know if we will be able to fully test tour code on Tuesday. Since the branch is going to be handed over to a knew maintainer I'd prefer if we did not include it with the 2013 release. As we agreed last Tuesday, this branch will not be a blocker since it is not required for any of our last seasons code.
Concerning my tcpip branch, i will need some more time, so we can probably include it in the next release, which should be a minor release, because we will use it for the robot simulator as soon as it is working.
I think we will be compiling this season's code against the `develop` branch. Next summer the new code will be tested an we can release again. So just merge your tcp/ip branch into develop as soon as you are done. Since feature/experimental_structure will become the new develop we need to rebase your branch on top of it soon. But there is no hurry. Just tell we when you have time after the release and we can rebase the stuff "together" via Jabber.
Kevin _______________________________________________ xpcc-dev mailing list xpcc-dev@lists.rwth-aachen.de http://mailman.rwth-aachen.de/mailman/listinfo/xpcc-dev
participants (2)
-
Kevin Laeufer -
Thorsten Lajewski