From ceb58b58950ae7ecd610134c4b9902fa28aa2424 Mon Sep 17 00:00:00 2001
From: Neshura <neshura@neshweb.net>
Date: Wed, 7 Aug 2024 20:11:48 +0200
Subject: [PATCH] Test

---
 .forgejo/workflows/build+release.yml |  8 ++++----
 .forgejo/workflows/pull-requests.yml | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml
index b3db383..f7845d6 100644
--- a/.forgejo/workflows/build+release.yml
+++ b/.forgejo/workflows/build+release.yml
@@ -111,20 +111,20 @@ jobs:
       - name: Upload Debian Package to staging
         run: |
           echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \
-          --upload-file release_blobs/${{ needs.build.outputs.debian_name }}_'${{ needs.build.outputs.debian_ref }}${{ needs.build.outputs.debian_rev }}'_amd64.deb \
+          --upload-file release_blobs/${{ needs.build.outputs.debian_name }}_'${{ needs.build.outputs.debian_ref }}-${{ needs.build.outputs.debian_rev }}'_amd64.deb \
           ${{ env.GITHUB_API_URL }}/packages/${{ env.GITHUB_REPOSITORY_OWNER }}/debian/pool/bookworm/staging/upload'
           curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \
-          --upload-file release_blobs/${{ needs.build.outputs.debian_name }}_${{ needs.build.outputs.debian_ref }}${{ needs.build.outputs.debian_rev }}_amd64.deb \
+          --upload-file release_blobs/${{ needs.build.outputs.debian_name }}_${{ needs.build.outputs.debian_ref }}-${{ needs.build.outputs.debian_rev }}_amd64.deb \
           ${{ env.GITHUB_API_URL }}/packages/${{ env.GITHUB_REPOSITORY_OWNER }}/debian/pool/bookworm/staging/upload
 
       - name: Upload Debian Package to main
         if: (! contains(github.ref_name, '-rc'))
         run: |
           echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \
-          --upload-file release_blobs/${{ needs.build.outputs.debian_name }}_'${{ needs.build.outputs.debian_ref }}${{ needs.build.outputs.debian_rev }}'_amd64.deb \
+          --upload-file release_blobs/${{ needs.build.outputs.debian_name }}_'${{ needs.build.outputs.debian_ref }}-${{ needs.build.outputs.debian_rev }}'_amd64.deb \
           ${{ env.GITHUB_API_URL }}/packages/${{ env.GITHUB_REPOSITORY_OWNER }}/debian/pool/bookworm/main/upload'
           curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \
-          --upload-file release_blobs/${{ needs.build.outputs.debian_name }}_${{ needs.build.outputs.debian_ref }}${{ needs.build.outputs.debian_rev }}_amd64.deb \
+          --upload-file release_blobs/${{ needs.build.outputs.debian_name }}_${{ needs.build.outputs.debian_ref }}-${{ needs.build.outputs.debian_rev }}_amd64.deb \
           ${{ env.GITHUB_API_URL }}/packages/${{ env.GITHUB_REPOSITORY_OWNER }}/debian/pool/bookworm/main/upload
   
   create-release:
diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml
index e27deea..5b4d0e2 100644
--- a/.forgejo/workflows/pull-requests.yml
+++ b/.forgejo/workflows/pull-requests.yml
@@ -47,24 +47,24 @@ jobs:
       - name: Prepare build environment
         run: mkdir dist
 
-      #- name: Compiling To Linux Target
-      #  run: |
-      #    cargo build -r
-      #    mv target/release/${{ github.event.repository.name }} dist/${{ github.event.repository.name }}-linux-amd64
+      - name: Compiling To Linux Target
+        run: |
+          cargo build -r
+          mv target/release/${{ github.event.repository.name }} dist/${{ github.event.repository.name }}-linux-amd64
 
       - name: Bundle .deb package
         id: deb_bundle
         run: |
           DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~)
-          echo "debian_ref=$DEBIAN_REF" >> $GITHUB_OUTPUT
+          echo "debian_ref=$DEBIAN_REF" >> ${{ env.GITHUB_OUTPUT }}
           echo DEBIAN_REF: $DEBIAN_REF
-          DEBIAN_REV=-$(cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " ")
+          DEBIAN_REV=$(cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " ")
           echo "debian_rev=$DEBIAN_REV" >> ${{ env.GITHUB_OUTPUT }}
           echo DEBIAN_REV: $DEBIAN_REV
-          DEBIAN_NAME=-$(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ")
+          DEBIAN_NAME=$(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ")
           echo "debian_name=$DEBIAN_NAME" >> ${{ env.GITHUB_OUTPUT }}
           echo DEBIAN_NAME: $DEBIAN_NAME
-          
+          mv target/debian/${{ env.DEBIAN_NAME }}_${{ env.DEBIAN_REF }}-${{ env.DEBIAN_REV }}_amd64.deb dist/${{ env.DEBIAN_NAME }}_${{ env.DEBIAN_REF }}-${{ env.DEBIAN_REV }}_amd64.deb
 
       - name: Uploading Build Artifact
         uses: actions/upload-artifact@v3