From f3d6892c50a63bfaf42f70c245cd9a151b62b128 Mon Sep 17 00:00:00 2001
From: GoodM4ven <goodm4ven@proton.me>
Date: Mon, 18 Sep 2023 09:06:53 +0300
Subject: [PATCH] v2.1.5

- Combined both CLI flows into one: release then update logs
---
 ....yml => release-and-update-changelogs.yml} | 15 ++++++++-
 .github/workflows/update-changelog.yml        | 31 -------------------
 2 files changed, 14 insertions(+), 32 deletions(-)
 rename .github/workflows/{release.yml => release-and-update-changelogs.yml} (69%)
 delete mode 100644 .github/workflows/update-changelog.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release-and-update-changelogs.yml
similarity index 69%
rename from .github/workflows/release.yml
rename to .github/workflows/release-and-update-changelogs.yml
index ef5944c..7bc24dc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release-and-update-changelogs.yml
@@ -1,4 +1,4 @@
-name: Create Release and Auto Merge
+name: Create Release, Auto Merge, and Update Changelog
 
 on:
   push:
@@ -37,3 +37,16 @@ jobs:
         body_path: .github/release_body.md
         draft: false
         prerelease: false
+
+    - name: Update Changelog
+      uses: stefanzweifel/changelog-updater-action@v1
+      with:
+        latest-version: ${{ github.ref_name }}
+        release-notes: ${{ github.event.head_commit.message }}
+
+    - name: Commit updated CHANGELOG
+      uses: stefanzweifel/git-auto-commit-action@v4
+      with:
+        branch: master
+        commit_message: Update CHANGELOG
+        file_pattern: CHANGELOG.md
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
deleted file mode 100644
index b6ecf0c..0000000
--- a/.github/workflows/update-changelog.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: "Update Changelog"
-
-on:
-  release:
-    types: [released]
-
-permissions:
-  contents: write
-
-jobs:
-  update:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: master
-
-      - name: Update Changelog
-        uses: stefanzweifel/changelog-updater-action@v1
-        with:
-          latest-version: ${{ github.event.release.name }}
-          release-notes: ${{ github.event.release.body }}
-
-      - name: Commit updated CHANGELOG
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          branch: master
-          commit_message: Update CHANGELOG
-          file_pattern: CHANGELOG.md