Skip to content

Make dev the integration branch: dependabot, spec-sync and CI target dev #9

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
acossta merged 1 commit into from
Sep 25, 2026
Merged

Make dev the integration branch: dependabot, spec-sync and CI target dev #9

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: 2 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ version: 2
updates:
- package-ecosystem: npm
directory: /
target-branch: dev
schedule:
interval: weekly
groups:
dev-dependencies:
dependency-type: development
- package-ecosystem: github-actions
directory: /
target-branch: dev
schedule:
interval: monthly
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 @@ -2,7 +2,7 @@ name: CI

on:
push:
branches: [main]
branches: [main, dev]
pull_request:

permissions:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/spec-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: dev
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
Expand All @@ -27,6 +29,7 @@ jobs:
- run: pnpm typecheck && pnpm test
- uses: peter-evans/create-pull-request@v7
with:
base: dev
branch: chore/sync-v3-spec
commit-message: "Sync v3 catalog with Origami's published spec"
title: "Sync v3 catalog with Origami's published spec"
Expand Down
13 changes: 9 additions & 4 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ pnpm dev -- send campaigns list --help # run from source

Node.js 18+ and pnpm 10 (`corepack enable` picks the pinned version).

## Branches

Open pull requests against **`dev`**. `main` holds released code only and is protected: it
changes through a `dev` → `main` pull request at release time.

## Before you open a pull request

```bash
Expand Down Expand Up @@ -55,10 +60,10 @@ hand-written command next to the generated ones; keep those rare.

## Releasing (maintainers)

1. Bump `version` in `package.json` and add a `CHANGELOG.md` entry.
2. Merge to `main`.
3. Publish a GitHub release tagged `vX.Y.Z`. The release workflow publishes to npm with
provenance.
1. On `dev`: bump `version` in `package.json` and add a `CHANGELOG.md` entry.
2. Open a `dev` → `main` pull request; merge it once CI is green.
3. Publish a GitHub release tagged `vX.Y.Z` on `main`. The release workflow publishes to npm
with provenance.

By contributing you agree that your contributions are licensed under the [MIT License](LICENSE)
and that you'll follow the [Code of Conduct](CODE_OF_CONDUCT.md).
Loading