From 342f524ca3484d667f041686a73b51f3a4466290 Mon Sep 17 00:00:00 2001 From: Claudia Meadows Date: Wed, 27 Apr 2022 12:12:53 -0700 Subject: [PATCH] Fix branch target --- .github/workflows/merge.yml | 4 ++-- .github/workflows/pr.yml | 2 +- .github/workflows/rollback.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index fcf3988c..995cd189 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -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 }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3d9d88c4..bf805d5b 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -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 diff --git a/.github/workflows/rollback.yml b/.github/workflows/rollback.yml index 953d97fa..f3c73476 100644 --- a/.github/workflows/rollback.yml +++ b/.github/workflows/rollback.yml @@ -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 }}