From a3d336a2454e5d017d3c8d8027e524f04a36fbb9 Mon Sep 17 00:00:00 2001 From: Karolis Strazdas Date: Tue, 6 Oct 2026 14:28:41 +0300 Subject: [PATCH] chore: introduce development integration workflow --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release-checks.yml | 2 +- docs/RELEASING.md | 12 ++++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63a3ef98..089c183e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,13 +2,13 @@ name: CI on: push: - branches: [master, main] + branches: [development, master, main] paths: - 'app/**' - 'packages/**' - '.github/workflows/**' pull_request: - branches: [master, main] + branches: [development, master, main] paths: - 'app/**' - 'packages/**' diff --git a/.github/workflows/release-checks.yml b/.github/workflows/release-checks.yml index 85f5d66d..f0a687fa 100644 --- a/.github/workflows/release-checks.yml +++ b/.github/workflows/release-checks.yml @@ -4,7 +4,7 @@ on: pull_request: paths: ['tools/**', '.github/workflows/**', 'app/pubspec.yaml', 'app/android/**', 'packages/**'] push: - branches: [master] + branches: [development, master] paths: ['tools/**', '.github/workflows/**', 'app/pubspec.yaml', 'app/android/**', 'packages/**'] permissions: diff --git a/docs/RELEASING.md b/docs/RELEASING.md index 87fdd8c1..df2a447e 100644 --- a/docs/RELEASING.md +++ b/docs/RELEASING.md @@ -4,6 +4,18 @@ Android identity is `com.papyrus.reader`; the first uploaded bundle establishes in Play Console. Keep this identity for all subsequent uploads. The app name is Papyrus. The pinned Flutter 3.41.2 toolchain targets Android API 36. +## Branch workflow + +Feature and fix PRs target the default `development` branch. Merge them without +bumping the version. CI checks PRs and integration pushes; `development` does not +build or publish releases. + +When ready to release the accumulated changes, prepare the coordinated version +bump in a PR to `development`, then open `development` → `master`. Use **Create a +merge commit** for this promotion and bring `master` back into `development` +afterwards. The workspace release runbook describes the server/client merge +order. Keep both branches; do not squash release promotions. + ## Versions and triggers `app/pubspec.yaml` owns `version: MAJOR.MINOR.PATCH+BUILD`. The semantic portion