diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index da6b1826e..ab508c9c2 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -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 }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7fd5bdd22..b637c755a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -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 diff --git a/.github/workflows/push-main.yml b/.github/workflows/push-main.yml index aba934f3c..5bf122fb9 100644 --- a/.github/workflows/push-main.yml +++ b/.github/workflows/push-main.yml @@ -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: diff --git a/.github/workflows/rollback.yml b/.github/workflows/rollback.yml index 6ed33b345..1dbe32e57 100644 --- a/.github/workflows/rollback.yml +++ b/.github/workflows/rollback.yml @@ -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 }} diff --git a/.github/workflows/test-next-push.yml b/.github/workflows/test-next-push.yml index 5df53932e..5323b42c4 100644 --- a/.github/workflows/test-next-push.yml +++ b/.github/workflows/test-next-push.yml @@ -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 diff --git a/docs/releasing.md b/docs/releasing.md index 89bfe11f4..d49a8a6b9 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -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