Convenzione di nomenclatura di branch¶

La nostra convenzione di nomenclatura di branch assicura che il software possa essere buildato dal nostro CI e testato facilmente dai nostri sviluppatori.

Ogni file README delle repository git dovrebbe indicare che convenzione di nomenclatura di branch è stata usata e qualsiasi deviazioni dalla norma.

Click-Packages¶

Software exclusively distributed as a click-package (and not also as a DEB) only uses one master branch that is protected. Separate temporary development branches with arbitrary descriptive names can be created and merged into master when the time comes. Ideally Git tags or GitHub releases should be used to mark and archive milestones in the development history.

Pacchetti DEB¶

To help us deliver our code into Ubuntu Touch as effortlessly as possible, our CI automatically build our Git repositories into a number of APT archives hosted at http://repo.ubports.com/, according to the branch name.

Manteniamo i seguenti branch tra le repository git:

Branch di Git	Descrizione	Archivi APT corrispettivi
Branch di Git	Descrizione	Nome	Distribuzione di base
`main`, `ubports/latest`	Rappresenta gli ultimi sviluppi di Ubuntu Touch. Ogni tipo di modifica è permessa in questo branch.	`devel-<Ubuntu LTS>` (e.g. `devel-noble`)	Ultima o prossima Ubuntu LTS.
`main`, `ubports/latest`		`devel-debian`	Test di Debian.
`ubports/<major version>.x` (e.g. `ubports/24.6.x`)	Represents the code in a particular major version. It branches off of the `main` branch before the major release, and will become a part of the releases of that major version. Only bugfixes and non-breaking changes are allowed in this branch.	`<major version>.x` (e.g. `24.6.x`)	Ubuntu LTS al momento del branching.
`ubports/focal`	A special case of `ubports/<major version>.x`, which is branched after the release of Ubuntu Touch 20.04 OTA-4.	`focal`	Ubuntu 20.04 LTS.
`ubports/focal_-_<ext>`	Branches which use the deprecated «branch extensions» system for cross-components changes. No longer recommended for usage.	`focal_-_<ext>`	Ubuntu 20.04 LTS.
`personal/<user>/<name>`, and any other branches.	All other branches may be used for proposing merge requests or for other reasons. Theses branches are not built by the CI unless proposed as a merge request.	N/A, unless proposed as an MR against aforementioned branches (see below).

To ensure the main branch doesn’t miss any changes, all changes must be made against main branch first before backporting to the major release branches. An exception is when a change is not applicable to the main branch anymore due to other changes in that branch.

Nota

If the next development version is not available for testing yet, and you need the change to be made available for install for testing, it’s allowed to temporarily target the changeset to the major version branch to get packages built against that version. When the changeset is ready for merge, the changeset must be re-targeted to the main branch.

Archivi APT per richieste di merge¶

In addition to archives mentioned above, we also create APT archives for MRs made against our Git repositories. This allows us to test the result of the build on real devices using ubports-qa before merging the code. For each MR, the CI will build the code against all the same targets as the MR’s target branch, and then will append _-_PR_<repository name>_<MR number> to them [1]. For example:

An MR numbered 100 made against the main branch of Git repository lomiri (when the current Ubuntu LTS is noble) will have APT archives named devel-noble_-_PR_lomiri_100 and devel-debian_-_PR_lomiri_100.
An MR numbered 125 made against the ubports/24.6.x branch of Git repository morph-browser will have an APT archive named 24.6.x_-_PR_morph-browser_125.