New blog post: Trunk-Based Development + GitLab + GitOps as the default workflow#105
Draft
Copilot wants to merge 13 commits into
Draft
New blog post: Trunk-Based Development + GitLab + GitOps as the default workflow#105Copilot wants to merge 13 commits into
Copilot wants to merge 13 commits into
Conversation
…with Mermaid diagrams Agent-Logs-Url: https://github.com/sunix/blog.sunix.org/sessions/0e8f1a96-bae4-4caa-b329-00924c8ba5db Co-authored-by: sunix <650571+sunix@users.noreply.github.com>
Agent-Logs-Url: https://github.com/sunix/blog.sunix.org/sessions/0e8f1a96-bae4-4caa-b329-00924c8ba5db Co-authored-by: sunix <650571+sunix@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Create blog post on trunk-based development with GitLab and GitOps
New blog post: Trunk-Based Development + GitLab + GitOps as the default workflow
Apr 16, 2026
Owner
|
/preview |
|
❌ Preview build failed. |
Owner
|
@copilot |
…mplate errors Agent-Logs-Url: https://github.com/sunix/blog.sunix.org/sessions/67553078-9860-41ee-8e49-f2bae72fa651 Co-authored-by: sunix <650571+sunix@users.noreply.github.com>
Contributor
Author
... Fixed in commit The Qute template engine was interpreting the Mermaid decision-node syntax like |
Owner
|
/preview |
|
🚀 Preview deployed successfully! 🌐 Preview: https://pr-105-sunix-blog-preview.surge.sh |
Owner
|
@copilot could you add a final git tree (vertical) that will summarize everything:
|
Agent-Logs-Url: https://github.com/sunix/blog.sunix.org/sessions/32e6b4e4-c25e-460c-b0d7-0b4e0646b805 Co-authored-by: sunix <650571+sunix@users.noreply.github.com>
Contributor
Author
Added in commit
A short legend below the diagram explains the highlighted/red commit types. |
Owner
|
/preview |
|
🚀 Preview deployed successfully! 🌐 Preview: https://pr-105-sunix-blog-preview.surge.sh |
Owner
|
@copilot ok for the final schema could you replaced with and the configuration ( i don't know how to add this) |
…and Mermaid theme config Agent-Logs-Url: https://github.com/sunix/blog.sunix.org/sessions/adbc310e-4ec0-4bee-9c43-bcee7be83222 Co-authored-by: sunix <650571+sunix@users.noreply.github.com>
Contributor
Author
... Done in commit |
Owner
|
@copilot last changes and |
… parallelCommits config Agent-Logs-Url: https://github.com/sunix/blog.sunix.org/sessions/7952de9e-afba-463b-b16d-3c5283a764c6 Co-authored-by: sunix <650571+sunix@users.noreply.github.com>
Contributor
Author
... Done in commit
|
Owner
|
/preview |
|
🚀 Preview deployed successfully! 🌐 Preview: https://pr-105-sunix-blog-preview.surge.sh |
Updated sections on releases, maintenance, and Git hygiene for clarity and emphasis on best practices.
Owner
|
/preview |
|
🚀 Preview deployed successfully! 🌐 Preview: https://pr-105-sunix-blog-preview.surge.sh |
Removed unnecessary lines and adjusted formatting in the markdown file.
Owner
|
/preview |
|
🚀 Preview deployed successfully! 🌐 Preview: https://pr-105-sunix-blog-preview.surge.sh |
Owner
|
@copilot In the The Full Picture Flowchart , i would like to add yes/no steps after, Promote to val (Running on test on Val, yes --> promote to val, no --> go back to developer, |
… flowchart Agent-Logs-Url: https://github.com/sunix/blog.sunix.org/sessions/ceca93ec-ca2d-4517-a052-a61884d56b40 Co-authored-by: sunix <650571+sunix@users.noreply.github.com>
Contributor
Author
Done in commit
|
Owner
|
/preview |
|
❌ Preview build failed. |
Owner
|
The Full Picture flowchart after the release final version, should be promoted to preprod and prod |
…ide) in Full Picture flowchart Agent-Logs-Url: https://github.com/sunix/blog.sunix.org/sessions/490aea65-1618-4aa0-be6c-c94ce0bc002e Co-authored-by: sunix <650571+sunix@users.noreply.github.com>
Contributor
Author
Done in commit |
Owner
|
@copilot for the Full Picture flowchart, |
Agent-Logs-Url: https://github.com/sunix/blog.sunix.org/sessions/51c98b85-7e34-4f07-8094-876440704db4 Co-authored-by: sunix <650571+sunix@users.noreply.github.com>
Contributor
Author
Done in commit
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up to Why I Think Git Flow Doesn't Fit Most Projects Anymore — this post provides the concrete replacement workflow.
New post (
2026-04-16-trunk-based-development-gitlab-gitops.md)Covers the full opinionated stack: single
mainbranch, ephemeral per-MR environments, GitLab-owned releases (RC → val → preprod → prod), GitOps via ArgoCD/Helm/Kubernetes, cherry-pick-based maintenance branches, and Jira/conventional-commits traceability alignment.All git diagrams use Conventional Commits Option B style with Jira refs:
feat(ABC-123): description,fix(ABC-456): description,release: v1.x.y.Includes 8 Mermaid diagrams:
main) — uses Option B commit stylerelease/vX.Y.Z+ cherry-pick) — verticalgitGraph TBwith🍒cherry-pick prefix,parallelCommits: true, and Option B commit styleRun tests on val→Val OK?→ preprod or back to dev) and after promoting to preprod (e2e tests on preprod→Preprod OK?→ release to production or restore prod version and back to dev)gitGraph TB): feature MRs with Option B conventional commits + Jira refs (feat(ABC-101): ...,fix(ABC-105): ...), a blocked MR with dev test failures (type: REVERSE), RC1→RC2→RC3 with per-environment 🟢/🔴 validation indicators in commit and tag labels, final release tag (v1.4.0), arelease/v1.4.xmaintenance branch with a cherry-picked hotfix promoted through preprod tov1.4.1, and a trailingv1.5.0-rc.1with a failing val. Styled via a Mermaid%%{init}%%theme config (git1: #ffbe28,git2: #ff0000,parallelCommits: true).Mermaid.js support (
templates/layouts/main.html)Added Mermaid v11 via CDN (ESM). Since the Roq/Qute Markdown renderer emits
<pre><code class="language-mermaid">rather than<div class="mermaid">, a small synchronous DOM pre-pass converts them beforemermaid.initializeruns:Bug fix
Mermaid decision-node syntax (
{...}) and%%{init}%%configuration directives inside Mermaid code blocks were being interpreted as Qute template expressions, causing a 500 error on page render. Fixed by escaping all curly braces in Mermaid content with\{/\}so Qute outputs them as literals.