development:software:create_branch_in_meta

Creating a branch in the meta-repository

Checklist:

1. Inform everyone in advance (3-5 days).

2. Check if there are any “incomplete” merge requests in the pipeline.

3. Branch ebee-controller_meta:

git checkout master
git submodule update –recursive

git submodule foreach --recursive git checkout -b 5.xx_Maintenance
git submodule foreach --recursive git push origin 5.xx_Maintenance
git checkout -b 5.xx_Maintenance
git push origin 5.xx_Maintenance

4. Master Meta and Master controller-software should receive a tag for the upcoming milestone. Make sure the tag does not point to the same commit as the root of the branch, otherwise, the tag will apply to both. Create a “dummy” commit in the controller-software master if necessary, which can be tagged.

5. Branch Linux4sam-meta:See step 3.

6. Webui needs to be branched separately.Repository: https://gitlab.com/ebee_smart/ebee_web_ui/

git checkout master
git checkout -b 5.xx_Maintenance
git push origin 5.xx_Maintenance

7. The commit hash for the branch must be specified in the corresponding branch of controller-software in controller_software/buildroot_overlay/package/webui_ebee/webui_ebee.mk. (It should already be correct as long as the new branch is still identical to the master.)

8. CI (Continuous Integration) needs to be adjusted for all existing projects (web_ui, controller, meta) when branching.

9. Buildbot needs to be adjusted (add the new branch to the list).

  • development/software/create_branch_in_meta.txt
  • Last modified: 2023/05/26 07:47
  • by udo-riedel