From 70483d926790e5b61e12b2e5b2f6163f09b4aff0 Mon Sep 17 00:00:00 2001
From: amass <168062547@qq.com>
Date: Tue, 2 Jul 2024 00:53:32 +0800
Subject: [PATCH] hh

---
 .gitea/workflows/release.yaml | 14 ++------------
 resources/build.sh            |  4 ++--
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml
index fdffa77..070c496 100644
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@@ -5,17 +5,6 @@ on:
     tags:
       - 'v*'
 jobs:
-  PullDocker:
-    runs-on: [ubuntu-latest, ubuntu-24.04]
-    steps:
-      - name: Login to Docker Registry
-        uses: docker/login-action@v2
-        with:
-          registry: frp-by1.wwvvww.cn:45288
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Pull Docker image
-        run: docker pull frp-by1.wwvvww.cn:45288/ubuntu_dev:22.04
   Build:
     runs-on: [ubuntu-latest, ubuntu-24.04]
     container:
@@ -29,7 +18,8 @@ jobs:
       - name: Generate Changelog
         run: |
           set -eux
-          resources/build.sh
+          git log $(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1))..$(git describe --tags --abbrev=0) --reverse --pretty=format:"%B"
+          git log $(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1))..$(git describe --tags --abbrev=0) --reverse --pretty=format:"%B" | nl -w2 -s". "
           git log $(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1))..$(git describe --tags --abbrev=0) --reverse --pretty=format:"%B" | nl -w2 -s". " > ${{ github.workspace }}-CHANGELOG.txt
       - name: Upload Gitea Release
         uses: akkuman/gitea-release-action@v1
diff --git a/resources/build.sh b/resources/build.sh
index 371894a..c7a4aae 100755
--- a/resources/build.sh
+++ b/resources/build.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-set -eux
-function changelog(){
 
+
+function changelog(){
     current_tag=$(git describe --tags --abbrev=0)
     previous_tag=$(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1))
     git log ${previous_tag}..${current_tag} --reverse --pretty=format:"%B" | nl -w2 -s". " > CHANGELOG.txt