diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06eac26..dee8607 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: Documentation checks on: pull_request: push: - branches: [master] + branches: [development, master] workflow_dispatch: permissions: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1f25116..117e442 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,6 +16,7 @@ concurrency: jobs: build: + if: github.ref == 'refs/heads/master' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/README.md b/README.md index a24774f..de88658 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,12 @@ make serve Preview at . `make build` produces `_build/html/` and treats Sphinx warnings as failures. `make lint` additionally checks external links. -The Deploy workflow builds with the same lock and publishes GitHub Pages on master. +Feature/fix PRs target the default `development` branch. CI checks PRs and +integration pushes without publishing. When ready, promote `development` to +`master` with a release PR using **Create a merge commit**, then bring `master` +back into `development`. The Deploy workflow builds with the same lock and +publishes GitHub Pages only from `master`, including manual runs. Keep both +long-lived branches and do not squash release promotions. ## API snapshot