Build: Implement trunk-based development with feature flags

0/1 steps

✓📚 Read

✓👁 See

✓🎞 Animate

✓🎯 Test

5⚙️ Build

Build Steps

Progress

0/1

◆ Before you start

Prerequisites

Git 2.40+Required
git --version
GitHub/GitLab repoOptional
Remote access configured

🌳

Step 1 of 1

Implement trunk-based development with feature flags

Set up a trunk-based development workflow with short-lived branches, PR checks, and feature flags.

Tasks

Create a feature branch from main with naming convention feat/TICKET-description

Set up branch protection rules (required reviews, CI passing)

Configure GitHub Actions to enforce no long-lived branches

Implement a simple feature flag in code using environment config

Merge via squash and verify clean history on main

🎯 What You'll Learn

▸Understand GitFlow vs trunk-based development trade-offs
▸Create short-lived feature branches that merge in <24h
▸Use feature flags to decouple deployment from release

Code

YAMLbranch-protection.yaml
1 # GitHub branch protection rules (via API or UI)
2 # Settings > Branches > Add rule
3  
4 name: main
5 protection_rules:
6   required_status_checks:
7     strict: true  # Require branch up-to-date before merging
8     contexts:
9       - "ci/tests"
10       - "ci/lint"
11       - "ci/security-scan"
12  
13   required_pull_request_reviews:
14     required_approving_review_count: 1
15     dismiss_stale_reviews: true
16     require_code_owner_reviews: true
17  
18   enforce_admins: false
19   restrictions: null  # Allow all collaborators to push
20  
21   # Block force pushes
22   allow_force_pushes: false
23   allow_deletions: false
24

💡 Pro Tips

▸Trunk-based development requires strong CI/CD — every commit to main must be deployable
▸Feature flags let you merge incomplete work safely — separate deployment from release

Discussion

1 # GitHub branch protection rules (via API or UI) 2 # Settings > Branches > Add rule 3 4 name: main 5 protection_rules: 6 required_status_checks: 7 strict: true # Require branch up-to-date before merging 8 contexts: 9 - "ci/tests" 10 - "ci/lint" 11 - "ci/security-scan" 12 13 required_pull_request_reviews: 14 required_approving_review_count: 1 15 dismiss_stale_reviews: true 16 require_code_owner_reviews: true 17 18 enforce_admins: false 19 restrictions: null # Allow all collaborators to push 20 21 # Block force pushes 22 allow_force_pushes: false 23 allow_deletions: false 24

1	# GitHub branch protection rules (via API or UI)
2	# Settings > Branches > Add rule
3
4	name: main
5	protection_rules:
6	required_status_checks:
7	strict: true # Require branch up-to-date before merging
8	contexts:
9	- "ci/tests"
10	- "ci/lint"
11	- "ci/security-scan"
12
13	required_pull_request_reviews:
14	required_approving_review_count: 1
15	dismiss_stale_reviews: true
16	require_code_owner_reviews: true
17
18	enforce_admins: false
19	restrictions: null # Allow all collaborators to push
20
21	# Block force pushes
22	allow_force_pushes: false
23	allow_deletions: false
24