From 855988e94718abd5017bcaaba75ba5cdc1774e0a Mon Sep 17 00:00:00 2001
From: Neshura <neshura@neshweb.net>
Date: Fri, 29 Dec 2023 14:51:26 +0100
Subject: [PATCH] Change rc naming from x.y.zrc to x.y.z-rc

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

diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml
index 194fb69..0e3b42e 100644
--- a/.forgejo/workflows/build+release.yml
+++ b/.forgejo/workflows/build+release.yml
@@ -5,7 +5,7 @@ on:
     push:
         tags:
             - '[0-9]+.[0-9]+.[0-9]+'
-            - '[0-9]+.[0-9]+.[0-9]+rc[0-9]+'
+            - '[0-9]+.[0-9]+.[0-9]+-rc[0-9]+'
 jobs:
     test:
         runs-on: docker
@@ -81,16 +81,18 @@ jobs:
         if: success()
         runs-on: docker
         steps:
-            - name: Downloading All Build Artifacts
-              uses: actions/download-artifact@v3
-            - name: Upload Binary
-              run: |
-                  echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \
-                  --upload-file release_blobs/${{ github.event.repository.name }}-linux-amd64 \
-                  https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/generic/${{ github.event.repository.name }}/${{ github.ref_name }}/${{ github.event.repository.name }}-linux-amd64'
-                  curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \
-                  --upload-file release_blobs/${{ github.event.repository.name }}-linux-amd64 \
-                  https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/generic/${{ github.event.repository.name }}/${{ github.ref_name }}/${{ github.event.repository.name }}-linux-amd64
+            -
+                name: Downloading All Build Artifacts
+                uses: actions/download-artifact@v3
+            -
+                name: Upload Binary
+                run: |
+                    echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \
+                    --upload-file release_blobs/${{ github.event.repository.name }}-linux-amd64 \
+                    https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/generic/${{ github.event.repository.name }}/${{ github.ref_name }}/${{ github.event.repository.name }}-linux-amd64'
+                    curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \
+                    --upload-file release_blobs/${{ github.event.repository.name }}-linux-amd64 \
+                    https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/generic/${{ github.event.repository.name }}/${{ github.ref_name }}/${{ github.event.repository.name }}-linux-amd64
 
     upload-debian-package:
         needs: build
diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml
index 2e53c8e..cec9915 100644
--- a/.forgejo/workflows/pull-requests.yml
+++ b/.forgejo/workflows/pull-requests.yml
@@ -12,11 +12,11 @@ jobs:
     container: forgejo.neshweb.net/ci-docker-images/rust-node:latest
     steps:
       -
-        name: Add Clippy
-        run: rustup component add clippy
+          name: Add Clippy
+          run: rustup component add clippy
       -
-        name: Checking Out Repository Code
-        uses: https://code.forgejo.org/actions/checkout@v3
+          name: Checking Out Repository Code
+          uses: https://code.forgejo.org/actions/checkout@v3
       -
         name: Set Up Cargo Cache
         uses: actions/cache@v3