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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/**'
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/**', 'app/pubspec.yaml', 'app/android/**', 'packages/**']
push:
branches: [master]
branches: [development, master]
paths: ['tools/**', '.github/workflows/**', 'app/pubspec.yaml', 'app/android/**', 'packages/**']

permissions:
Expand Down
12 changes: 12 additions & 0 deletions docs/RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading