Skip to content

ci: run main CI checks on release branches too #1740

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

Open
jescalada wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ci: run main CI checks on release branches too #1740

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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name: CI

on:
push:
branches: [main]
branches: [main, 'release/**']
pull_request:
branches: [main]
branches: [main, 'release/**']

permissions:
pull-requests: write
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: 'CodeQL'

on:
push:
branches: ['main']
branches: ['main', 'release/**']
pull_request:
branches: ['main']
branches: ['main', 'release/**']
schedule:
- cron: '25 10 * * 1'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cve.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ permissions:

on:
push:
branches: ['main']
branches: ['main', 'release/**']
pull_request:
branches: ['main']
branches: ['main', 'release/**']
schedule:
- cron: '0 6 * * 1' # Weekly Monday 6am UTC

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ permissions:

on:
push:
branches: [main]
branches: [main, 'release/**']
pull_request:
workflow_dispatch:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/package-smoke-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name: Package Smoke Test

on:
push:
branches: [main]
branches: [main, 'release/**']
pull_request:
branches: [main]
branches: [main, 'release/**']

permissions:
contents: read
Expand Down
2 changes: 2 additions & 0 deletions website/docs/development/releases.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ When a milestone reaches completion, we cut a `release/X.Y` branch from `main`,

When a bug affecting a released version is reported, we **open a PR against the oldest supported release branch containing the bug**. After the fix is merged to that branch, we **merge it forward**. Suppose we support the following versions: `1.1`, `2.2` and `3.0`. If a bug affecting `2.2` is discovered, we first merge the fix into `2.2`. Then, we merge `2.2` into `3.0`, which ensures that all affected, supported versions inherit the bugfix. Since commit identity is preserved, a single SHA exists on all branches the fix was applied to. We can then easily audit that a particular version contains a fix by using `git merge-base --is-ancestor`.

PRs and merges against `release/*` branches run the same CI checks as `main` (including unit/e2e tests, NPM package smoke tests, CodeQL, and CVE scanning).

Features and changes other than bugfixes never go into a release branch. If you want a feature included in the next minor release, you should target `main` so it gets picked up in the next milestone.

## Release Planning
Expand Down
Loading