From caa3307a4f268b0a57af9f2c9a2bb4733f1e8ce9 Mon Sep 17 00:00:00 2001 From: Karolis Strazdas Date: Tue, 6 Oct 2026 14:28:43 +0300 Subject: [PATCH] chore: introduce development integration workflow --- .github/workflows/ci.yml | 2 +- .github/workflows/release-checks.yml | 2 +- deploy/README.md | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 51c97dc..e877020 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: CI on: push: - branches: [master] + branches: [development, master] pull_request: jobs: diff --git a/.github/workflows/release-checks.yml b/.github/workflows/release-checks.yml index 5db3a52..a8f968d 100644 --- a/.github/workflows/release-checks.yml +++ b/.github/workflows/release-checks.yml @@ -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: diff --git a/deploy/README.md b/deploy/README.md index 891ffd1..a486c62 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -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