From a3d09db01480a299b2d32aa65542e160db72bf5d Mon Sep 17 00:00:00 2001
From: James Forbes <james.a.forbes@gmail.com>
Date: Sat, 30 Oct 2021 14:51:36 +1100
Subject: [PATCH] Use the new --changelog flag in merge command

---
 .github/workflows/merge.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index d758fbe..bd786fa 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -28,10 +28,7 @@ jobs:
         cache: 'npm'
     - run: npm ci
     - run: npm run build --if-present
-    - run: node bin.js changelog --target main --source next --out changelog.md
-      env:
-        GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-    - run: node bin.js merge --target main --source next --commit --force --clean
+    - run: node bin.js merge --target main --source next --commit --force --clean --changelog --compact
       env:
         GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}