From 30c16d3df71c53089642db48b022919ea2e15d23 Mon Sep 17 00:00:00 2001
From: chen08209 <chen08209@gmail.com>
Date: Thu, 10 Oct 2024 17:14:46 +0800
Subject: [PATCH] cache

---
 .github/workflows/change.yml |  14 +++--
 CHANGELOG.md                 | 118 -----------------------------------
 2 files changed, 9 insertions(+), 123 deletions(-)
 delete mode 100644 CHANGELOG.md

diff --git a/.github/workflows/change.yml b/.github/workflows/change.yml
index ec2aafce..aba82830 100644
--- a/.github/workflows/change.yml
+++ b/.github/workflows/change.yml
@@ -17,20 +17,24 @@ jobs:
       - name: Generate
         run: |
           tags=$(git tag --merged $(git rev-parse HEAD) --sort=-creatordate)
+          lastTag = ""
+          previous = ""
           if [ -f CHANGELOG.md ]; then
-            previous=$(grep -oP '^## \K.*' CHANGELOG.md | head -n 1)
+            lastTag=$(grep -oP '^## \K.*' CHANGELOG.md | head -n 1)
+            previous = lastTag
           fi
           for tag in $tags; do
-            if [ "$tag" == "$previous" ]; then
+            if [ -n "$lastTag" ] && [ "$(echo -e "$tag\n$lastTag" | sort -V | head -n 1)" == "$tag" ]; then
               break
             fi
             echo "## $tag" >> NEW_CHANGELOG.md
             echo "" >> NEW_CHANGELOG.md
-            git log --pretty=format:"%B" "$tag..$previous" | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
-            echo "" >> NEW_CHANGELOG.md
             if [ -z "$previous" ]; then
-              break;
+              git log --pretty=format:"%B" "$tag.." | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
+            else
+              git log --pretty=format:"%B" "$tag..$previous" | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
             fi
+            echo "" >> NEW_CHANGELOG.md
             previous=$tag
           done
           if [ -f CHANGELOG.md ]; then
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index def505da..00000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,118 +0,0 @@
-## v0.8.61
-
-- cache
-
-- Update Changelog
-
-- cache
-
-- Update Changelog
-
-- cache
-
-- Update Changelog
-
-- Update CHANGELOG.md
-
-- Update Changelog
-
-- cache
-
-- Update Changelog
-
-- cache
-
-- Update Changelog
-
-- cache
-
-- cache
-
-- Update Changelog
-
-- (cherry picked from commit 957613c2e80bebe7f3ec0cbfd70b46968179085b)
-
-- Update change.yml 2
-
-- (cherry picked from commit 0d583b829819a7d322d28ed63cf6e954a0214621)
-
-- Update Changelog
-
-- (cherry picked from commit a64509c1d577b25411c6b22803c4b8c5ba6cbc9b)
-
-- Update change.yml
-
-- (cherry picked from commit 308282f4a861fec7b847262886bb2342fb7a7953)
-
-- Update Changelog
-
-- (cherry picked from commit 1c392630b57de1a16bf0877b22902ad9a49ee1df)
-
-- Fix workflow error 7
-
-- (cherry picked from commit 8565abd7025888de43cd82471f341c05912dbba8)
-
-- Update Changelog
-
-- (cherry picked from commit ea9bb650734f1fd991928c0ef626b145a58ef1a7)
-
-- Fix workflow error 6
-
-- (cherry picked from commit 2dc52d66868f6ca47f2fc5b643994f7bd19eacaf)
-
-- Update Changelog
-
-- (cherry picked from commit f7186c23e0f65d596cc65a5b6c70d007f4a10183)
-
-- Fix workflow error 5
-
-- (cherry picked from commit 2729636f16a265c5baea71f04592cc08a783eb57)
-
-- Fix workflow error 4
-
-- (cherry picked from commit b3607e88631467f70214ec280c038f4915985bd8)
-
-- Update Changelog
-
-- (cherry picked from commit 3b2a1b59dcbfca61cf3ff718e379a713020a64c7)
-
-- Fix workflow error 3
-
-- (cherry picked from commit 4b2096cd57f762b8f31adfd3cb440ad822be334f)
-
-- Update Changelog
-
-- (cherry picked from commit 9ea21090a52dda9aa9b4e9cb910b7ef1e89dace2)
-
-- Fix workflow error 2
-
-- (cherry picked from commit bcdd33161155544965e796df29e3c42289e95c1c)
-
-- Fix workflow error
-
-- (cherry picked from commit 428d5784786ab1e9f2bbcf4d66bc072a61726a34)
-
-- Fix windows tray issues
-
-- Fix urltest issues
-
-- Add auto changelog
-
-- Fix windows admin auto launch issues
-
-- Add android vpn options
-
-- Support proxies icon configuration
-
-- Optimize android immersion display
-
-- Fix some issues
-
-- Optimize ip detection
-
-- Support android vpn ipv6 inbound switch
-
-- Support log export
-
-- Optimize more details
-