Namenskonvention für Git-Zweige¶

Unsere Namenskonvention für Git-Zweige stellt sicher dass Software durch unsere CI gebaut werden kann und einfach durch andere Entwickler getestet werden kann.

README Dateien in den Git repositories sollten ihre Namenskonvention für Git-Zweige klarstellen und etwaige Abweichungen von dieser Norm beschreiben.

Click Pakete¶

Software die ausschliesslich als click Paket (und nicht auch als DEB) veröffentlicht wird, hat nur einen master Zweig der geschützt ist. Separate, temporäre Entwicklungszweige mit beliebigen, deskriptiven Namen können erstellt und zusammengeführt werden wenn es dafür Zeit ist. Idealerweise sollten Git tags oder GitHub Veröffentlichungen verwendet werden um Meilensteine in der Entwicklungsgeschichte zu markieren und zu archivieren.

DEB Pakete¶

Um eine möglichst reibungslose Bereitstellung unseres Codes für Ubuntu Touch zu gewährleisten, baut unsere CI unsere Git-Repositorys automatisch in verschiedene APT-Archive um. Diese werden je nach Branch-Namen unter http://repo.ubports.com/ bereitgestellt.

Wir pflegen die folgenden Branches in unseren Git-Repositorys:

Git-Zweige	Beschreibung	Zugehörige APT-Archive
Git-Zweige	Beschreibung	Name	Basis-Distribution
`main`, `ubports/latest`	Represents the latest development of Ubuntu Touch. All kinds of changes are allowed in this branch.	`devel-<Ubuntu LTS>` (e.g. `devel-noble`)	Latest or upcoming Ubuntu LTS.
`main`, `ubports/latest`		`devel-debian`	Debian testing.
`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.	`<Hauptversion>.x` (z. B. `24.6.x`)	Ubuntu LTS at the time of 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.

Bemerkung

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.

APT archives for Merge Requests¶

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.