Handle build from same commit

kekchpek · Feb 26, 2024 · c4fc680 · c4fc680
1 parent a5d9860
commit c4fc680
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -29,20 +29,28 @@ jobs:
         lastTagMainVersion=$(sed -n 's/^\([0-9]*\.[0-9]*\).*/\1/p' <<<"$lastTag")
         currentVersion=$(cat VERSION)
         currentMainVersion=$(sed -n 's/^\([0-9]*\.[0-9]*\).*/\1/p' <VERSION)
+        currentTag=$(git describe --tags --abbrev=0)
         if [ "$lastTagMainVersion" = "$currentMainVersion" ]
         then
-          echo "Version the same."
-          lastTagBuildVersion=$(sed -n 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*/\1/p' <<<"$lastTag")
-          newBuildVersion=$((lastTagBuildVersion+1))
-          newVersion="$lastTagMainVersion"."$newBuildVersion"
+          newVersion=$lastTag
           echo "newVersion=$newVersion"
           echo "newVersion=$newVersion" >> $GITHUB_ENV
         else
-          echo "New version!"
-          newVersion="$currentMainVersion".1
-          VersionPrefix=$newVersion
-          echo "newVersion=$newVersion"
-          echo "newVersion=$newVersion" >> $GITHUB_ENV
+          if [ "$lastTagMainVersion" = "$currentMainVersion" ]
+          then
+            echo "Version the same."
+            lastTagBuildVersion=$(sed -n 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*/\1/p' <<<"$lastTag")
+            newBuildVersion=$((lastTagBuildVersion+1))
+            newVersion="$lastTagMainVersion"."$newBuildVersion"
+            echo "newVersion=$newVersion"
+            echo "newVersion=$newVersion" >> $GITHUB_ENV
+          else
+            echo "New version!"
+            newVersion="$currentMainVersion".1
+            VersionPrefix=$newVersion
+            echo "newVersion=$newVersion"
+            echo "newVersion=$newVersion" >> $GITHUB_ENV
+          fi
         fi
         sed -i '' -e "s/\(<Version>\)\(.*\)\(<\/Version>\)/\1$newVersion\3/" src/UnityMVVM/UnityMVVM.csproj
     - name: Run tests