Skip to content

Fix Branch Strategy - #313

Merged
a5chin merged 7 commits into
developfrom
fix/branch
Oct 8, 2026
Merged

a5chin merged 7 commits into
developfrom
fix/branch

Conversation

@a5chin

@a5chin a5chin commented Oct 8, 2026 •

Copy link
Copy Markdown
Owner

User description

Type of Change

  • Hotfix
  • Bug Fix
  • Dependency Update
  • Feature
  • Refactor
  • CI/CD
  • Documentation

Related Issues

Breaking Changes

  • No breaking changes
  • API signature changed
  • Configuration changed
  • Behavior changed
  • Dependencies changed
  • Features removed

Checklist

  • Dependencies added/updated
  • New environment variables
  • Performance impact assessed
  • Security implications reviewed
  • Deployment notes

Additional Context


PR Type

Refactor, Documentation, Enhancement


Description

  • Centralize repository settings and branch protection on main

  • Refactor release workflow for matrix builds and draft releases

  • Update bot PR approval and assignment logic

  • Streamline documentation across README.md, CONTRIBUTING.md, and CLAUDE.md


Diagram Walkthrough

flowchart TD
  subgraph Old Workflow
    Old_Develop_Branch["'develop' Branch"] -- Push --> Old_Publish_App_Workflow["Publish App/Devcontainer"]
    Old_Main_Branch["'main' Branch"] -- Push --> Old_Release_Workflow["Publish Release"]
  end

  subgraph New Workflow
    New_Main_Branch["'main' Branch"] -- Push --> New_Release_Publish["Build & Push Images (Develop)"]
    New_Release_Publish -- Success --> New_Release_Draft["Update Draft Release"]
    New_Release_Draft -- Manual Publish --> New_Release_Production["Build & Push Images (Production)"]
    New_Release_Production -- Tag 'v*' --> GHCR["GHCR"]
  end

  Old_Develop_Branch -- Removed --> New_Main_Branch
  Old_Publish_App_Workflow -- Removed --> New_Release_Publish
  Old_Main_Branch -- Refactored --> New_Release_Publish
  New_Main_Branch -- PR Merge --> New_Release_Publish
  New_Release_Publish -- "Images: main, sha-<SHA>" --> GHCR
  New_Release_Production -- "Images: <tag>, latest" --> GHCR
Loading

File Walkthrough

Relevant files
Configuration changes
9 files
labeler.yml
Remove 'release' branch labeler rule                                         
+0/-3     
protection.json
Remove 'develop' branch protection rules                                 
+0/-15   
publish-app.yml
Remove dedicated app image publishing workflow                     
+0/-73   
publish-devcontainer.yml
Remove dedicated devcontainer image publishing workflow   
+0/-73   
setting.yml
Centralize repository settings and environment deployment policies
+11/-7   
test.yml
Remove 'develop' branch from test workflow triggers           
+0/-1     
.pre-commit-config.yaml
Add '--unsafe' argument to 'check-yaml' pre-commit hook   
+1/-0     
settings.json
Add custom YAML tag for Mermaid superfences in VS Code settings
+3/-0     
mkdocs.yml
Update MkDocs configuration for snippets, Mermaid, and new navigation
structure
+13/-2   
Enhancement
2 files
approve.yml
Update bot detection for PR approval workflow                       
+1/-1     
assign.yml
Update bot detection for PR assignment workflow                   
+1/-1     
Refactor
1 files
release.yml
Refactor release workflow for matrix builds, GHCR publishing, and
draft releases
+73/-29 
Documentation
21 files
CLAUDE.md
Rewrite Claude Code guidance for GitHub Flow and updated documentation
structure
+54/-263
CONTRIBUTING.md
Streamline contribution guidelines and link to detailed documentation
+26/-379
README.md
Simplify README, remove detailed sections, and link to comprehensive
documentation
+24/-351
index.md
Simplify configuration overview and update environment file guidance
+13/-190
pre-commit.md
Update pre-commit documentation with new hooks and snippet usage
+15/-98 
ruff.md
Update Ruff configuration documentation and VS Code settings snippet
+9/-100 
sqruff.md
Add new documentation for sqruff configurations                   
+31/-0   
test.md
Simplify pytest configuration documentation                           
+2/-28   
ty.md
Simplify ty configuration documentation                                   
+1/-3     
index.md
Update getting started guide for Docker and local setup, add template
usage
+17/-6   
branch-strategy.md
Add new documentation for GitHub Flow branch strategy and release flow
+81/-0   
ci-cd.md
Add new documentation for CI/CD workflows                               
+36/-0   
code-standards.md
Add new documentation for code standards, testing, and common issues
+166/-0 
index.md
Refactor development guides, simplify nox explanation, and add
contributing section
+20/-214
config.md
Update configuration management documentation for environment files
and testing
+13/-22 
logger.md
Update logger testing and add guide for new log types       
+17/-9   
tracer.md
Update tracer testing documentation to use 'capsys'           
+11/-11 
ty.md
Update ty guide for CI/CD integration                                       
+1/-1     
uv.md
Update uv Python version pinning command                                 
+1/-1     
index.md
Restructure main documentation page with new sections and common
commands
+28/-34 
jupyter.md
Add warning about archived Jupyter branch                               
+3/-0     

@github-actions github-actions Bot added documentation Improvements or additions to documentation fix labels Oct 8, 2026
@codecov

codecov Bot commented Oct 8, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 100.00%. Comparing base (ada504a) to head (741ecda).
✅ All tests successful. No failed tests found.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##           develop      #313   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files            9         9           
  Lines          103       103           
  Branches         1         1           
=========================================
  Hits           103       103           
Flag Coverage Δ
unittests 100.00% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report in Codecov by Harness.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ada504a...741ecda. Read the comment docs.

@a5chin
a5chin deployed to github-pages October 8, 2026 09:40 — with GitHub Actions Active
@a5chin

a5chin commented Oct 8, 2026

Copy link
Copy Markdown
Owner Author

/review

@github-actions

github-actions Bot commented Oct 8, 2026

Copy link
Copy Markdown
Contributor

Preparing review...

@a5chin

a5chin commented Oct 8, 2026

Copy link
Copy Markdown
Owner Author

/review

@github-actions

github-actions Bot commented Oct 8, 2026

Copy link
Copy Markdown
Contributor

Preparing review...

@a5chin
a5chin deployed to github-pages October 8, 2026 10:19 — with GitHub Actions Active
@a5chin
a5chin merged commit 1b6f102 into develop Oct 8, 2026
13 checks passed
@a5chin
a5chin deleted the fix/branch branch October 8, 2026 10:20

This branch was successfully deployed

1 active deployment
github-pages — 741ecdab Deployed Oct 8, 2026 by a5chin via deploy #539
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation fix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant