From af6316a91e55bc289e4ed90650e1edfb2ebae7dc Mon Sep 17 00:00:00 2001
From: Jonathan Wren <jonathan@nowandwren.com>
Date: Sat, 21 Nov 2020 12:03:13 -0800
Subject: [PATCH 1/7] add bot token since gh actions doesn't allow pushing to
 protected branch

---
 .github/workflows/changelog.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
index 2a53f2914..d847fa03a 100644
--- a/.github/workflows/changelog.yaml
+++ b/.github/workflows/changelog.yaml
@@ -78,5 +78,5 @@ jobs:
           git config user.name "Jrnl Bot"
           git add "$FILENAME"
           git commit -m "Update changelog"
-          git push origin $BRANCH
+          git push https://${JRNL_BOT_TOKEN}@github.com/jrnl-org/jrnl.git $BRANCH
 

From 95c4bc7f2b080212da90392d18ccd65c9d4c2147 Mon Sep 17 00:00:00 2001
From: Jonathan Wren <jonathan@nowandwren.com>
Date: Sat, 21 Nov 2020 12:08:02 -0800
Subject: [PATCH 2/7] add a max for issues, since we keep getting rate limited

---
 .github/workflows/changelog.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
index d847fa03a..e809af067 100644
--- a/.github/workflows/changelog.yaml
+++ b/.github/workflows/changelog.yaml
@@ -56,6 +56,7 @@ jobs:
           excludeLabels: stale,wontfix
           excludeTagsRegex: '(alpha|beta|rc)'
           sinceTag: ${{ env.gittag }}
+          maxIssues: 150
           releaseUrl: https://pypi.org/project/jrnl/%s/
           verbose: false
 

From 0751d1fb60830a83ebbe5a4ca1d4b9beb026be43 Mon Sep 17 00:00:00 2001
From: Jonathan Wren <jonathan@nowandwren.com>
Date: Sat, 21 Nov 2020 14:35:02 -0800
Subject: [PATCH 3/7] add jrnl bot username to commit step

---
 .github/workflows/changelog.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
index e809af067..3cdab0918 100644
--- a/.github/workflows/changelog.yaml
+++ b/.github/workflows/changelog.yaml
@@ -79,5 +79,5 @@ jobs:
           git config user.name "Jrnl Bot"
           git add "$FILENAME"
           git commit -m "Update changelog"
-          git push https://${JRNL_BOT_TOKEN}@github.com/jrnl-org/jrnl.git $BRANCH
+          git push https://jrnl-bot:${JRNL_BOT_TOKEN}@github.com/jrnl-org/jrnl.git $BRANCH
 

From eca9d0b316602eaa6c9c15cfe0be54a4ea3ddaa7 Mon Sep 17 00:00:00 2001
From: Jonathan Wren <jonathan@nowandwren.com>
Date: Sat, 21 Nov 2020 14:44:57 -0800
Subject: [PATCH 4/7] change token for git repo

---
 .github/workflows/changelog.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
index 3cdab0918..a90f1efb4 100644
--- a/.github/workflows/changelog.yaml
+++ b/.github/workflows/changelog.yaml
@@ -10,6 +10,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.JRNL_BOT_TOKEN }}
 
       - name: Check branch for new commits
         run: |
@@ -79,5 +81,5 @@ jobs:
           git config user.name "Jrnl Bot"
           git add "$FILENAME"
           git commit -m "Update changelog"
-          git push https://jrnl-bot:${JRNL_BOT_TOKEN}@github.com/jrnl-org/jrnl.git $BRANCH
+          git push origin $BRANCH
 

From db3c99cb3b1348e354443bc3f6b8e14fcf01b3ab Mon Sep 17 00:00:00 2001
From: Jonathan Wren <jonathan@nowandwren.com>
Date: Sat, 21 Nov 2020 14:52:34 -0800
Subject: [PATCH 5/7] debugging

---
 .github/workflows/changelog.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
index a90f1efb4..3aa7d1038 100644
--- a/.github/workflows/changelog.yaml
+++ b/.github/workflows/changelog.yaml
@@ -30,6 +30,9 @@ jobs:
           echo "BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
           echo "FILENAME=CHANGELOG.md" >> $GITHUB_ENV
           echo "gittag=$(git tag --sort=-creatordate | grep -Ev '(alpha|beta|rc)' | awk 'NR==1')" >> $GITHUB_ENV
+          echo "git tag: $(git tag --sort=-creatordate)"
+          echo "git tag: $(git tag --sort=-creatordate | grep -Ev '(alpha|beta|rc)')"
+          echo "git tag: $(git tag --sort=-creatordate | grep -Ev '(alpha|beta|rc)' | awk 'NR==1')"
 
       - name: Prep changelog file (clear out old lines)
         run: |

From 19eabe7df2e8b69673ef2863ed4822592ca6aa1b Mon Sep 17 00:00:00 2001
From: Jonathan Wren <jonathan@nowandwren.com>
Date: Sat, 21 Nov 2020 14:56:22 -0800
Subject: [PATCH 6/7] debugging

---
 .github/workflows/changelog.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
index 3aa7d1038..bb167b9ed 100644
--- a/.github/workflows/changelog.yaml
+++ b/.github/workflows/changelog.yaml
@@ -16,6 +16,7 @@ jobs:
       - name: Check branch for new commits
         run: |
           git fetch origin
+          git fetch --tags origin
           BRANCH="${GITHUB_REF##*/}"
           if [[ $(git rev-parse "origin/$BRANCH") != $GITHUB_SHA ]]; then
             echo "BRANCH: $BRANCH"

From 3bd3900d9c86d9f9901d56df715ab33f83019c37 Mon Sep 17 00:00:00 2001
From: Jonathan Wren <jonathan@nowandwren.com>
Date: Sat, 21 Nov 2020 15:00:03 -0800
Subject: [PATCH 7/7] take out debugging statements

---
 .github/workflows/changelog.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
index bb167b9ed..8bc906056 100644
--- a/.github/workflows/changelog.yaml
+++ b/.github/workflows/changelog.yaml
@@ -31,9 +31,6 @@ jobs:
           echo "BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
           echo "FILENAME=CHANGELOG.md" >> $GITHUB_ENV
           echo "gittag=$(git tag --sort=-creatordate | grep -Ev '(alpha|beta|rc)' | awk 'NR==1')" >> $GITHUB_ENV
-          echo "git tag: $(git tag --sort=-creatordate)"
-          echo "git tag: $(git tag --sort=-creatordate | grep -Ev '(alpha|beta|rc)')"
-          echo "git tag: $(git tag --sort=-creatordate | grep -Ev '(alpha|beta|rc)' | awk 'NR==1')"
 
       - name: Prep changelog file (clear out old lines)
         run: |