Fix branch target

This commit is contained in:
Claudia Meadows 2022-04-27 12:12:53 -07:00 committed by Stephan Hoyer
parent ff646e8fb8
commit 342f524ca3
3 changed files with 4 additions and 4 deletions

View file

@ -2,7 +2,7 @@ name: merge
on:
push:
branches: [ main ]
branches: [ master ]
workflow_dispatch:
@ -30,7 +30,7 @@ jobs:
cache: 'npm'
- 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
- run: npx pr-release merge --target master --source next --commit --force --clean --changelog ./docs/recent-changes.md --compact
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

View file

@ -29,7 +29,7 @@ jobs:
cache: 'npm'
- run: npm ci
- run: npm run build
- run: npx pr-release pr --verbose --target main --source next --compact --verbose
- run: npx pr-release pr --verbose --target master --source next --compact --verbose
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
# The following will publish a prerelease to npm

View file

@ -26,6 +26,6 @@ jobs:
cache: 'npm'
- 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 master --source next --verbose --ignore 'package*' --ignore docs/changelog.md --ignore docs/recent-changes.md
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}