refactor how to ignore the beta tag for versioning

Author: nschimme

.github/workflows/build-appimage.yml

@@ -17,11 +17,6 @@ jobs:
       with:
         fetch-depth: 0
         submodules: true
-    - name: Get Git tag description
-      id: git_info
-      run: |
-        git tag -d beta 2>/dev/null || echo "Tag 'beta' not found"
-        echo "GIT_TAG=$(git describe --tags --always --long)" >> $GITHUB_ENV
 
     - name: Install Build Dependencies
       run: |

.github/workflows/build-appx.yml

@@ -18,16 +18,6 @@ jobs:
       with:
         fetch-depth: 0
         submodules: true
-    - name: Delete beta tag
-      shell: bash
-      run: |
-        if git tag | grep -q '^beta$'; then
-          git tag -d beta
-        fi
-    - name: Get Git tag description
-      id: git_info
-      run: |
-        echo "GIT_TAG=$(git describe --tags --always --long)" >> $GITHUB_ENV
     - uses: lukka/get-cmake@latest
     - uses: ilammy/msvc-dev-cmd@v1
 

.github/workflows/build-flatpak.yml

@@ -26,9 +26,8 @@ jobs:
       id: git_info
       run: |
         git config --global --add safe.directory $(pwd)
-        git tag -d beta 2>/dev/null || echo "Tag 'beta' not found"
-        VERSION=$(git tag --points-at HEAD | grep '^v' | sed 's/^v//' || true)
-        VERSION=${VERSION:-$(git rev-parse --short HEAD || true)}
+        VERSION=$(git tag --points-at HEAD | grep -v '^beta$' | sed 's/^v//' | head -n 1 || true)
+        VERSION=${VERSION:-$(git describe --tags --always --long --exclude beta | sed 's/^v//' || true)}
         VERSION=${VERSION:-$(cat MMAPPER_VERSION)}
         ARCHITECTURE=$(uname -m)
         FILE="org.mume.MMapper-${VERSION}-Linux-${ARCHITECTURE}.flatpak"

.github/workflows/build-release.yml

@@ -22,16 +22,6 @@ jobs:
       with:
         fetch-depth: 0
         submodules: true
-    - name: Delete beta tag
-      shell: bash
-      run: |
-        if git tag | grep -q '^beta$'; then
-          git tag -d beta
-        fi
-    - name: Get Git tag description
-      id: git_info
-      run: |
-        echo "GIT_TAG=$(git describe --tags --always --long)" >> $GITHUB_ENV
     - if: runner.os == 'Windows' || runner.os == 'macOS'
       uses: lukka/get-cmake@latest
     - if: runner.os == 'Windows'

.github/workflows/build-test.yml

@@ -30,16 +30,6 @@ jobs:
       with:
         fetch-depth: 0
         submodules: true
-    - name: Delete beta tag
-      shell: bash
-      run: |
-        if git tag | grep -q '^beta$'; then
-          git tag -d beta
-        fi
-    - name: Get Git tag description
-      id: git_info
-      run: |
-        echo "GIT_TAG=$(git describe --tags --always --long)" >> $GITHUB_ENV
     - if: runner.os == 'Windows' || runner.os == 'macOS'
       uses: lukka/get-cmake@latest
     - if: matrix.compiler == 'msvc'

CMakeLists.txt

@@ -126,15 +126,15 @@ if(EXISTS "${PROJECT_SOURCE_DIR}/.git")
 
         # Describe the most recent tag, number of commits since, and abbreviated commit hash
         execute_process(
-          COMMAND ${GIT_EXECUTABLE} describe --tags --always --long
+          COMMAND ${GIT_EXECUTABLE} describe --tags --always --long --exclude beta
           WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
           OUTPUT_VARIABLE GIT_TAG_COMMIT_HASH
           OUTPUT_STRIP_TRAILING_WHITESPACE
         )
 
         # Detect if this checkout is a tag and extract its name if so
         execute_process(
-          COMMAND ${GIT_EXECUTABLE} name-rev --name-only --tags --no-undefined HEAD
+          COMMAND ${GIT_EXECUTABLE} name-rev --name-only --tags --no-undefined HEAD --exclude beta
           WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
           OUTPUT_VARIABLE GIT_TAG_NAME
           OUTPUT_STRIP_TRAILING_WHITESPACE

org.mume.MMapper.json

@@ -134,9 +134,6 @@
                     "path": "."
                 }
             ],
-            "build-commands": [
-                "git tag -d beta || true"
-            ],
             "config-opts": [
                 "-DCMAKE_BUILD_TYPE=Release",
                 "-DWITH_WEBSOCKET=ON",

snapcraft.yaml

@@ -73,8 +73,7 @@ parts:
       - zlib1g
     override-pull: |
       craftctl default
-      git tag -d beta 2>/dev/null || echo "Tag 'beta' not found"
-      craftctl set version=$(git describe --tags --always --long)
+      craftctl set version=$(git describe --tags --always --long --exclude beta | sed 's/^v//')
     override-build: |
       craftctl default
       sed -i 's|Icon=org.mume.MMapper|Icon=${SNAP}/usr/share/icons/hicolor/256x256/apps/org.mume.MMapper.png|g' $CRAFT_PART_INSTALL/usr/share/applications/org.mume.MMapper.desktop