diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 306289ec..37e30ec4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,9 @@ name: ci on: push: - branches: [main] + # Integration branch + release branch. PRs already run via pull_request + # (any base); this list is only for post-merge push runs. + branches: [dev, main] pull_request: # a force-push while CI is mid-run should cancel the stale run, not queue diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7495d123..b323a133 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,6 +10,9 @@ name: Release # - To force a specific version, either: # * run this workflow manually (Actions tab) and type it into "version", or # * put "[release X.Y.Z]" anywhere in the commit message. +# +# Branch model: day-to-day work merges to `dev`. Releases stay on `main` only +# so promoting `dev` -> `main` is the ship gate that cuts a build. on: push: