Skip to content

Commit

Permalink
main -> release
Browse files Browse the repository at this point in the history
  • Loading branch information
dead-claudia committed Sep 25, 2024
1 parent 806cb99 commit 61ad84c
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: merge

on:
push:
branches: [ main ]
branches: [ release ]

workflow_dispatch:

Expand All @@ -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 }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ 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
- run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
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
4 changes: 2 additions & 2 deletions .github/workflows/push-main.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rollback.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
4 changes: 2 additions & 2 deletions .github/workflows/test-next-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ 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
- run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
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
6 changes: 3 additions & 3 deletions docs/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 61ad84c

Please sign in to comment.