main -> release

This commit is contained in:
Claudia Meadows 2024-09-24 19:25:23 -07:00
parent 806cb99ead
commit 61ad84c1d9
No known key found for this signature in database
GPG key ID: C86B594396786760
6 changed files with 12 additions and 12 deletions

View file

@ -2,7 +2,7 @@ name: merge
on:
push:
branches: [ main ]
branches: [ release ]
workflow_dispatch:
@ -21,7 +21,7 @@ jobs:
node-version: 20
- run: npm ci
- run: npm run build
- run: npx pr-release merge --target main --source next --commit --force --clean --changelog ./docs/recent-changes.md --compact --minimize-semver-change
- run: npx pr-release merge --target release --source next --commit --force --clean --changelog ./docs/recent-changes.md --compact --minimize-semver-change
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

View file

@ -19,7 +19,7 @@ jobs:
node-version: 20
- run: npm ci
- run: npm run build
- run: npx pr-release pr --verbose --target main --source next --compact --verbose --minimize-semver-change
- run: npx pr-release pr --verbose --target release --source next --compact --verbose --minimize-semver-change
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
# The following will publish a prerelease to npm
@ -27,5 +27,5 @@ jobs:
name: Setup NPM Auth
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- run: npx pr-release infer-prerelease --preid=next --target main --source next --verbose --publish --minimize-semver-change
- run: npx pr-release infer-prerelease --preid=next --target release --source next --verbose --publish --minimize-semver-change
name: Publish

View file

@ -1,8 +1,8 @@
name: Warn on pushing to `main`
name: Warn on pushing to `release`
on:
pull_request_target:
types: [opened]
branches: [main]
branches: [release]
permissions:
issues: write
jobs:

View file

@ -16,6 +16,6 @@ jobs:
node-version: 20
- run: npm ci
- run: npm run build
- run: npx pr-release rollback --verbose --target main --source next --verbose --ignore 'package*' --ignore docs/changelog.md --ignore docs/recent-changes.md
- run: npx pr-release rollback --verbose --target release --source next --verbose --ignore 'package*' --ignore docs/changelog.md --ignore docs/recent-changes.md
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

View file

@ -21,7 +21,7 @@ jobs:
node-version: 20
- run: npm ci
- run: npm run build
- run: npx pr-release pr --verbose --target main --source next --compact --verbose --minimize-semver-change
- run: npx pr-release pr --verbose --target release --source next --compact --verbose --minimize-semver-change
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
# The following will publish a prerelease to npm
@ -29,5 +29,5 @@ jobs:
name: Setup NPM Auth
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- run: npx pr-release infer-prerelease --preid=next --target main --source next --verbose --publish --minimize-semver-change
- run: npx pr-release infer-prerelease --preid=next --target release --source next --verbose --publish --minimize-semver-change
name: Publish

View file

@ -16,7 +16,7 @@ pr-release handles the following:
## For contributors
Contributors should create their feature branch targetting the default branch `next`. When this branch is merged `pr-release` will either generate or update a release PR from `next` to `main`.
Contributors should create their feature branch targetting the default branch `next`. When this branch is merged `pr-release` will either generate or update a release PR from `next` to `release`.
The description and title will be managed by [pr-release], including the semver version.
@ -50,8 +50,8 @@ Fixes to documentation can land whenever, updates to the site are built and publ
$ git checkout next
$ git pull mithriljs next
# Splat the docs folder from next onto main
$ git checkout main
# Splat the docs folder from next onto release
$ git checkout release
$ git checkout next -- ./docs
# Manually ensure that no new feature docs were added