From cd9ba2163e1a52f81aadb48286595d76ed5cf41f Mon Sep 17 00:00:00 2001 From: Karolis Strazdas Date: Tue, 6 Oct 2026 14:28:45 +0300 Subject: [PATCH] chore: introduce development integration workflow --- .github/workflows/ci.yml | 2 +- README.md | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1682da..ca03bef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: Website build on: pull_request: push: - branches: [master] + branches: [development, master] workflow_dispatch: permissions: diff --git a/README.md b/README.md index aa42e20..3753c63 100644 --- a/README.md +++ b/README.md @@ -75,8 +75,14 @@ proxy/network must be provisioned first from the workspace's `deploy/edge` runbook. Website containers publish no host ports. They do not join the app's private network or mount its files. -Run `npm version patch --no-git-tag-version` to update `package.json` and -`package-lock.json`, then include both files in the website pull request. +Ordinary feature/fix PRs target the default `development` branch without a +version bump. CI builds and tests integration changes without deploying them. + +When ready to release, run `npm version patch --no-git-tag-version` to update +`package.json` and `package-lock.json` in a preparation PR to `development`. +Then open `development` → `master` and use **Create a merge commit**. Bring +`master` back into `development` after the release; keep both long-lived branches +and do not squash release promotions. After merging into `master`, **Website release** builds only when that version increases. It verifies and deploys the archive, checks the public build revision, then publishes a GitHub release with its SHA-256 checksum. Run the workflow