Automatically generate CHANGELOG.md on a push into master (#124)

iMicknl · Jul 7, 2020 · de462c2 · de462c2
1 parent 9d2ab9f
commit de462c2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
@@ -22,8 +22,8 @@ jobs:
           CI_USER: ${{ secrets.YOUR_GITHUB_USER }}
           CI_EMAIL: ${{ secrets.YOUR_GITHUB_EMAIL }}
         run: |
-          git checkout update-changelog
-          git merge master
+          git checkout -B changelog
+          git merge origin/master
           git config --local user.email "$CI_EMAIL"
           git config --local user.name "$CI_USER"
           git add CHANGELOG.md && git commit -m 'Updated CHANGELOG.md' && echo ::set-env name=push::1 || echo "No changes to CHANGELOG.md"
@@ -34,4 +34,4 @@ jobs:
           CI_USER: ${{ secrets.YOUR_GITHUB_USER }}
           CI_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          git push "https://$CI_USER:[email protected]/$GITHUB_REPOSITORY.git" HEAD:update-changelog
+          git push "https://$CI_USER:[email protected]/$GITHUB_REPOSITORY.git" HEAD:changelog