Use --abbrev=0 in all build workflows

dosbox-staging · Dec 20, 2023 · 7f81914 · 7f81914
1 parent eb77b64
commit 7f81914
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -313,7 +313,7 @@ jobs:
           set -x
           git fetch --prune --unshallow
           git fetch --all --tags --force
-          export VERSION=$(git describe --abbrev=5)
+          export VERSION=$(git describe --abbrev=0)
           echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: Setup release build
@@ -396,7 +396,7 @@ jobs:
           set +x
           git fetch --unshallow
           git fetch --all --tags --force
-          VERSION=$(git describe --abbrev=4)
+          VERSION=$(git describe --abbrev=0)
           echo "VERSION=$VERSION" >> $GITHUB_ENV
           NEWEST_TAG=$(git describe --abbrev=0)
           git log "$NEWEST_TAG..HEAD" > changelog-$VERSION.txt

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -237,7 +237,7 @@ jobs:
           set -x
           git fetch --prune --unshallow
           git fetch --all --tags --force
-          export VERSION=$(git describe --abbrev=5)
+          export VERSION=$(git describe --abbrev=0)
           echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: Setup and build release
@@ -280,7 +280,7 @@ jobs:
           set -x
           git fetch --prune --unshallow
           git fetch --all --tags --force
-          export VERSION=$(git describe --abbrev=5)
+          export VERSION=$(git describe --abbrev=0)
           echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: Install brew depedencies
@@ -345,7 +345,7 @@ jobs:
           set +x
           git fetch --unshallow
           git fetch --all --tags --force
-          VERSION=$(git describe --abbrev=4)
+          VERSION=$(git describe --abbrev=0)
           echo "VERSION=$VERSION" >> $GITHUB_ENV
           NEWEST_TAG=$(git describe --abbrev=0)
           git log "$NEWEST_TAG..HEAD" > changelog-$VERSION.txt

diff --git a/.github/workflows/windows-msvc.yml b/.github/workflows/windows-msvc.yml
@@ -158,7 +158,7 @@ jobs:
           set -x
           git fetch --prune --unshallow
           git fetch --all --tags --force
-          export VERSION=$(git describe --abbrev=4)
+          export VERSION=$(git describe --abbrev=0)
           # inject version based on vcs
           sed -i "s|DOSBOX_DETAILED_VERSION \"git\"|DOSBOX_DETAILED_VERSION \"$VERSION\"|" src/platform/visualc/config.h
           echo "VERSION=$VERSION" >> $GITHUB_ENV
@@ -246,7 +246,7 @@ jobs:
           set +x
           git fetch --unshallow
           git fetch --all --tags --force
-          VERSION=$(git describe --abbrev=4)
+          VERSION=$(git describe --abbrev=0)
           echo "VERSION=$VERSION" >> $GITHUB_ENV
           NEWEST_TAG=$(git describe --abbrev=0)
           git log "$NEWEST_TAG..HEAD" > changelog-$VERSION.txt

diff --git a/.github/workflows/windows-msys2.yml b/.github/workflows/windows-msys2.yml
@@ -277,7 +277,7 @@ jobs:
           set -x
           git fetch --prune --unshallow
           git fetch --all --tags --force
-          export VERSION=$(git describe --abbrev=5)
+          export VERSION=$(git describe --abbrev=0)
           echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: Inject package name
@@ -329,7 +329,7 @@ jobs:
             "$PKG_RELEASE"
           mv "${PKG_RELEASE}/dosbox.exe" "${PKG_RELEASE}/dosbox_with_debugger.exe"
           install -DT "${BUILD_RELEASE_DIR}/dosbox.exe" "${PKG_RELEASE}/dosbox.exe"
-          echo "artifact_name=dosbox-staging-windows-x64-`git describe --abbrev=4`" >> $GITHUB_ENV
+          echo "artifact_name=dosbox-staging-windows-x64-`git describe --abbrev=0`" >> $GITHUB_ENV
           echo "artifact_path=${{ github.workspace }}\msvc" >> $GITHUB_ENV
 
       - name: Windows Defender AV Scan
@@ -376,9 +376,9 @@ jobs:
             packageinfo="a development branch"
           fi
           mkdir out
-          echo "version_number=`git describe --tags --abbrev=4`" >> $GITHUB_ENV
+          echo "version_number=`git describe --tags --abbrev=0`" >> $GITHUB_ENV
           sed -e "s|%PACKAGE_INFORMATION%|${packageinfo}|;s|%GITHUB_REPO%|${{ github.repository }}|" docs/README.template >out/setup_preamble.txt
-          sed -i "s|DOSBOX-STAGING-VERSION|`git describe --tags --abbrev=4`|" contrib/windows_installer/DOSBox-Staging-setup.iss
+          sed -i "s|DOSBOX-STAGING-VERSION|`git describe --tags --abbrev=0`|" contrib/windows_installer/DOSBox-Staging-setup.iss
           echo @echo off >out/dosbox_with_console.bat
           echo \"%~dp0\\dosbox.exe\" %* >>out/dosbox_with_console.bat
           echo if errorlevel 1 pause >>out/dosbox_with_console.bat
@@ -438,7 +438,7 @@ jobs:
           set +x
           git fetch --unshallow
           git fetch --all --tags --force
-          VERSION=$(git describe --abbrev=4)
+          VERSION=$(git describe --abbrev=0)
           echo "VERSION=$VERSION" >> $GITHUB_ENV
           NEWEST_TAG=$(git describe --abbrev=0)
           git log "$NEWEST_TAG..HEAD" > changelog-$VERSION.txt