Merge branch 'main' into develop

.forgejo/workflows/stage.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - develop
+      - hotfix/*
+      - release/*
 
 jobs:
   build:
@@ -22,7 +24,7 @@ jobs:
     - run: yarn test
 
     - name: "Copy files over to location"
-      run: rsync -rvzP . ${{ secrets.STAGE_REPO_PATH }}
+      run: rsync -rvzP --delete . ${{ secrets.STAGE_REPO_PATH }}
 
   deploy:
     environment: prod
@@ -42,7 +44,7 @@ jobs:
         DB_DATA_LOCATION: ${{ secrets.STAGE_DB_DATA_LOCATION }}
         SERVER_PATH: ${{ secrets.STAGE_SSH_SERVER_PATH }}
         BOT_TOKEN: ${{ secrets.STAGE_BOT_TOKEN }}
-        BOT_VER: ${{ vars.STAGE_BOT_VER }}
+        BOT_VER: ${{ github.ref_name }}
         BOT_AUTHOR: ${{ vars.STAGE_BOT_AUTHOR }}
         BOT_OWNERID: ${{ vars.STAGE_BOT_OWNERID }}
         BOT_CLIENTID: ${{ vars.STAGE_BOT_CLIENTID }}

.forgejo/workflows/test.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - feature/*
-      - hotfix/*
       - renovate/*
 
 jobs: