From 134ad27176d2cae4afe4f735299bdfc789c44af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Fri, 9 Feb 2024 13:35:36 +0100 Subject: [PATCH] Update branch naming to not have a minor release suffix (gh#openela/issues#57) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Dirk Müller --- repository_structure.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/repository_structure.md b/repository_structure.md index b045ce0..35a085f 100644 --- a/repository_structure.md +++ b/repository_structure.md @@ -35,24 +35,24 @@ example: In openela-main organisation, these branch names are specified: -* **Base**: `el-9.0`, `el-9.1` -* **Modulemd**: `el-9.1-modulemd-$STREAM` +* **Base**: `el9` +* **Modulemd**: `el9-modulemd-$STREAM` * This contains _only_ the module document (modulemd). This is because a module might be a component, but also just a standalone module with other components. The modulemd is also relatively stable compared to SRPMs. -* **Module component**: `el-9.1-module-$STREAM` +* **Module component**: `el9-stream-$STREAM` * Contains the SRPM content like **Base**. Used for components of modules and separate from base due to each module stream having the ability to have a different version. In openela-contrib, these branch names are specified: -* **Base**: `el-9.0-contrib`, `el-9.1-contrib` -* **Modulemd**: `el-9.1-modulemd-$STREAM-contrib` +* **Base**: `el9-contrib` +* **Modulemd**: `el9-modulemd-$STREAM-contrib` * This contains _only_ the module document (modulemd). This is because a module might be a component, but also just a standalone module with other components. The modulemd is also relatively stable compared to SRPMs -* **Module component**: `el-9.1-module-$STREAM` +* **Module component**: `el9-stream-$STREAM` * Contains the SRPM content like “Base”. Used for components of modules and separate from base due to each module stream having the ability to have a different version.