De-master the repo

This commit is contained in:
Claudia Meadows 2024-09-24 16:37:04 -07:00
parent d32d59413e
commit e000cd0803
No known key found for this signature in database
GPG key ID: C86B594396786760
6 changed files with 19 additions and 21 deletions

View file

@ -4,9 +4,7 @@ on:
types: [opened] types: [opened]
pull_request_target: pull_request_target:
types: [opened] types: [opened]
permissions:
issues: write
repository-projects: write
jobs: jobs:
notify_triage: notify_triage:
uses: MithrilJS/infra/.github/workflows/notify-triage.yml@main uses: MithrilJS/infra/.github/workflows/notify-triage.yml@main
secrets: inherit

13
.github/workflows/push-main.yml vendored Normal file
View file

@ -0,0 +1,13 @@
name: Warn on pushing to `main`
on:
pull_request_target:
types: [opened]
branches: [main]
permissions:
issues: write
jobs:
comment:
uses: MithrilJS/infra/.github/workflows/reject-pr.yml@main
secrets: inherit
with:
correct_branch: next

View file

@ -1,13 +0,0 @@
name: Warn on pushing to `master`
on:
pull_request_target:
types: [opened]
branches: [master]
permissions:
issues: write
jobs:
comment:
uses: ./.github/workflows/_post-comment.yml
with:
url: ${{ github.event.pull_request.url }}
message: ⚠⚠⚠ Hey @${{ github.actor }}, did you mean to open this against `next`? ⚠⚠⚠

View file

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

View file

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

View file

@ -50,8 +50,8 @@ Fixes to documentation can land whenever, updates to the site are built and publ
$ git checkout next $ git checkout next
$ git pull mithriljs next $ git pull mithriljs next
# Splat the docs folder from next onto master # Splat the docs folder from next onto main
$ git checkout master $ git checkout main
$ git checkout next -- ./docs $ git checkout next -- ./docs
# Manually ensure that no new feature docs were added # Manually ensure that no new feature docs were added