From 2c5c59b7c57c5ff743d7bf8cad4c05b3503c3cb2 Mon Sep 17 00:00:00 2001 From: Jan Moringen Date: Tue, 7 Jun 2022 19:07:55 +0200 Subject: [PATCH] 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 --- .github/workflows/ubuntu-bionic.yml | 2 +- .github/workflows/ubuntu-focal.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu-bionic.yml b/.github/workflows/ubuntu-bionic.yml index 632654c..2589aac 100644 --- 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 index 3f816bb..ee0a62d 100644 --- 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