Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI

on:
push:
branches: [master]
branches: [development, master]
pull_request:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
paths: ['tools/**', '.github/workflows/**', 'pyproject.toml', 'deploy/**']
push:
branches: [master]
branches: [development, master]
paths: ['tools/**', '.github/workflows/**', 'pyproject.toml', 'deploy/**']

permissions:
Expand Down
10 changes: 10 additions & 0 deletions deploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ metadata comes from the installed Python package. GitHub releases record the
image digest; deploy a recorded digest instead of a mutable tag when stronger
artifact pinning is needed. The runtime uses UID/GID 10001, not root.

## Branch workflow

Feature/fix PRs target the default `development` branch and leave versions
unchanged. CI checks integration work without publishing a container. When ready,
prepare the coordinated version bump on `development`, then promote it to
`master` with a release PR using **Create a merge commit**. The existing version
gate publishes only from `master`. Bring `master` back into `development` after
the release, and deploy additive server changes before a client that needs them.
See the workspace `RELEASING.md` for coordination and merge order.

## Host and domains

Use a VM with Docker Engine/Compose v2 and Python 3.12+, enough disk for uploaded
Expand Down
Loading