From 0389ad841bbef9c955a4b42ed4540ed96d82f543 Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Thu, 2 Jan 2025 18:14:44 +0000
Subject: [PATCH] fix(ci): correctly retrieve release name

---
 .gitea/workflows/release.yml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index 0553835..8d61ef2 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -37,8 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     # needs: test
     outputs:
-      release_name: ${{ steps.tag_version.outputs.new_tag }}
-      success: ${{ steps.set_flag.outputs.success }}
+      release_name: ${{ steps.get_next_version.outputs.tag }}
     steps:
       - name: Check out repository
         uses: actions/checkout@v4.2.2
@@ -48,17 +47,10 @@ jobs:
       - name: Changes since last tag
         id: changes
         run: |
-          rm -f .changes .changes_feat .changes_fix .changes_dep .changes_other
+          rm -f .changes
           git log $(git describe --tags --abbrev=0)..HEAD --no-merges --oneline >> .changes
           cat .changes
 
-      - name: Upload changelog file
-        uses: actions/upload-artifact@v3
-        with:
-          name: changelog-file
-          path: ./.changes
-          include-hidden-files: true
-
       - name: Check for changes
         run: |
           if [[ -z $(grep '[^[:space:]]' .changes) ]] ; then
@@ -67,10 +59,6 @@ jobs:
           else
             echo "changes=true"
             echo "changes=true" >> "$GITEA_OUTPUT"
-            grep -i "feat" .changes >> .changes_feat || true
-            grep -i "fix" .changes >> .changes_fix || true
-            grep -i "dependencies" .changes >> .changes_dep || true
-            grep -i "other" .changes >> .changes_other || true
           fi
 
       - name: Cancel if no changes
@@ -168,8 +156,8 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ${{ vars.PACKAGES_REGISTRY_URL }}
-          username: ${{ vars.PACKAGES_REGISTRY_USERNAME }}
-          password: ${{ vars.PACKAGES_REGISTRY_PASSWORD }}
+          username: ${{ vars.ACTIONS_USERNAME }}
+          password: ${{ secrets.ACTIONS_TOKEN }}
 
       - name: Build Gitea image(s)
         uses: docker/build-push-action@v6