From 2a2aef77620594f74e4230d0139755a4de9a9b6f Mon Sep 17 00:00:00 2001 From: James Forbes Date: Thu, 31 Mar 2022 09:38:19 +1100 Subject: [PATCH] Use new changelog option in merge command --- .github/workflows/merge.yml | 2 +- .github/workflows/rollback.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 68ed9f0a..bd057a72 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -30,7 +30,7 @@ jobs: cache: 'npm' - run: npm ci - run: npm run build --if-present - - run: npx pr-release merge --target main --source next --commit --force --clean --changelog --compact --out ./docs/recent-changes.md + - run: npx pr-release merge --target main --source next --commit --force --clean --changelog ./docs/recent-changes.md --compact env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} diff --git a/.github/workflows/rollback.yml b/.github/workflows/rollback.yml index 1b2a8dd6..fa8907b6 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 --if-present - - run: npx pr-release rollback --verbose --target main --source next --verbose --ignore 'package*' --ignore changelog.md + - run: npx pr-release rollback --verbose --target main --source next --verbose --ignore 'package*' --ignore docs/changelog.md --ignore docs/recent-changes.md env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}