Merge remote-tracking branch 'origin/dev'

Author: sanny32

.github/workflows/build-deb-qt5-amd64.yml

@@ -44,9 +44,7 @@ jobs:
         run: |
           FULL_VERSION=$(grep -oP 'VERSION\s+\K[0-9]+\.[0-9]+\.[0-9]+' omodsim/CMakeLists.txt)
 
-          if [ ! -z "${{ github.event.inputs.tag }}" ]; then
-            APP_VERSION="${{ github.event.inputs.tag }}"
-          elif [ "${GITHUB_REF_NAME}" = "dev" ]; then
+          if [ "${GITHUB_REF_NAME}" = "dev" ] || [ "${{ github.event.inputs.branch }}" = "dev" ]; then
             MAJOR_MINOR=$(echo "$FULL_VERSION" | cut -d. -f1,2)
             APP_VERSION="${MAJOR_MINOR}~dev"
           else

.github/workflows/build-deb-qt6-amd64.yml

@@ -44,9 +44,7 @@ jobs:
         run: |
           FULL_VERSION=$(grep -oP 'VERSION\s+\K[0-9]+\.[0-9]+\.[0-9]+' omodsim/CMakeLists.txt)
 
-          if [ ! -z "${{ github.event.inputs.tag }}" ]; then
-            APP_VERSION="${{ github.event.inputs.tag }}"
-          elif [ "${GITHUB_REF_NAME}" = "dev" ]; then
+          if [ "${GITHUB_REF_NAME}" = "dev" ] || [ "${{ github.event.inputs.branch }}" = "dev" ]; then
             MAJOR_MINOR=$(echo "$FULL_VERSION" | cut -d. -f1,2)
             APP_VERSION="${MAJOR_MINOR}~dev"
           else

.github/workflows/build-rpm-qt6-x86_64.yml

@@ -44,9 +44,7 @@ jobs:
         run: |
           FULL_VERSION=$(grep -oP 'VERSION\s+\K[0-9]+\.[0-9]+\.[0-9]+' omodsim/CMakeLists.txt)
 
-          if [ ! -z "${{ github.event.inputs.tag }}" ]; then
-            APP_VERSION="${{ github.event.inputs.tag }}"
-          elif [ "${GITHUB_REF_NAME}" = "dev" ]; then
+          if [ "${GITHUB_REF_NAME}" = "dev" ] || [ "${{ github.event.inputs.branch }}" = "dev" ]; then
             MAJOR_MINOR=$(echo "$FULL_VERSION" | cut -d. -f1,2)
             APP_VERSION="${MAJOR_MINOR}~dev"
           else