Merge branch '7.x' into develop

.github/workflows/main.yml

@@ -25,15 +25,14 @@ jobs:
         run: |
           tag=
           if [[ "${{ github.event_name }}" == 'workflow_dispatch' ]]; then
-            tag="$(awk -F: '/^version:/ snap/snapcraft.yaml {print $2}' | tr -d '[:space:]')"
+            tag="$(awk -F: '/^version:/ {print $2}' snap/snapcraft.yaml | tr -d '[:space:]')"
           else
             tag="${{inputs.tag}}"
           fi
 
           echo "tag: $tag"
           echo "version=$tag" >> $GITHUB_OUTPUT
 
-
   build-and-test:
     needs: [ prereqs ]
     uses: RocketChat/server-snap/.github/workflows/test.yml@develop