Skip to content

chore: introduce development integration workflow #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Eoic merged 1 commit into from
Oct 6, 2026
Merged

chore: introduce development integration workflow #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Website build
on:
pull_request:
push:
branches: [master]
branches: [development, master]
workflow_dispatch:

permissions:
Expand Down
10 changes: 8 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading