From 781b01fc0d115221853df2eb4d6a328d374a5610 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal.hrusecky@nic.cz>
Date: Tue, 10 Jul 2018 15:39:12 +0200
Subject: [PATCH] WORKFLOW: Integrate Turtles
---
WORKFLOW.asciidoc | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/WORKFLOW.asciidoc b/WORKFLOW.asciidoc
index 92b91c358..3d81528aa 100644
--- a/WORKFLOW.asciidoc
+++ b/WORKFLOW.asciidoc
@@ -24,13 +24,18 @@ Latest kinda working release. Contains latest builds from upstream stable branch
and our latest development changes. Should be mostly stable, rolling and is
meant for testing latest features. Not for BFU, but mostly usable.
-Here Be Sloths (HBS)
-~~~~~~~~~~~~~~~~~~~~
+Here Be Turtles (HBT)
+~~~~~~~~~~~~~~~~~~~~~
Branch signed with deploy key, basically replacement for `rc`. Meant to contain
stuff we are planning to release. Should be ever more stable just a little
more bleeding edge that officially deployed images.
+Here Be Sloths (HBS)
+~~~~~~~~~~~~~~~~~~~~
+
+Branch for the real releases that are deployed to the end users automatically.
+
Source to binary
----------------
@@ -83,7 +88,7 @@ and configuration.
| ------------------------- ------------------------
v | build: v.4.0.0 | | build: v4.0.1 |
| | openwrt: #abcd1 | | openwrt: #abcd2 |
- | | tos-packages: #efgh1 | | tos-packages: #efgh2 | binaries: sloth (HBS)
+ | | tos-packages: #efgh1 | | tos-packages: #efgh2 | binaries: turtles (HBT)
| | packages: #ijkl1 | | packages: #ijkl2 |
| ------------------------- ------------------------
v | |
@@ -95,8 +100,8 @@ and configuration.
| | packages: for-v18 | ^ | -------------------------- ^ |
| -------------------------- | | | |
v ^ binaries: 4.0.0 v binaries: 4.0.1 v
- | | | |
- | | | -------------------------- | binaries: 4.1.0
+ | | (HBS) | (HBS) |
+ | | | -------------------------- | binaries: 4.1.0 (HBS)
| binaries: kittens (HBK) | | build: v4.1 | | |
| | | | openwrt: 18.5 | | v
v | ---| tos-packages: master |-->----------->------->--------->-----O----------->>>>
--
GitLab