Fix version computation in .github/workflows/ubuntu-*.yml

* .github/workflows/ubuntu-bionic.yml: allow tag to be of the form release-X.Y.Z and do not increment minor component of the version * .github/workflows/ubuntu-focal.yml: likewise
RDTK · Jun 7, 2022 · 2c5c59b · 2c5c59b
1 parent 13088db
commit 2c5c59b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/ubuntu-bionic.yml b/.github/workflows/ubuntu-bionic.yml
@@ -914,7 +914,7 @@ jobs:
           # Get precise version from git and write into version-string.sexp
           tag='release-*'
           git describe --long --dirty=-dirty --tags --match "${tag}"                              \
-            | sed -re 's/release-([0-9])+\.([0-9]+)-([0-9]+)-(.*)/echo "\\"\1.$((\2 + 1)).\3\\""/' \
+            | sed -re 's/release-([0-9])+\.([0-9]+(\.[0-9]+)?)-([0-9]+)-(.*)/echo "\\"\1.\2.\4\\""/' \
             | sh                                                                                   \
             > version-string.sexp
 

diff --git a/.github/workflows/ubuntu-focal.yml b/.github/workflows/ubuntu-focal.yml
@@ -914,7 +914,7 @@ jobs:
           # Get precise version from git and write into version-string.sexp
           tag='release-*'
           git describe --long --dirty=-dirty --tags --match "${tag}"                              \
-            | sed -re 's/release-([0-9])+\.([0-9]+)-([0-9]+)-(.*)/echo "\\"\1.$((\2 + 1)).\3\\""/' \
+            | sed -re 's/release-([0-9])+\.([0-9]+(\.[0-9]+)?)-([0-9]+)-(.*)/echo "\\"\1.\2.\4\\""/' \
             | sh                                                                                   \
             > version-string.sexp