Merge pull request #1204 from lukaszstolarczuk/fix-dockerimage-version-in-CI

Fix Docker image version(s) in CI

Author: Paweł Karczewski

.github/workflows/gha.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Get release version
         if: github.event_name == 'release'
         id: get_release_version
-        run: echo ::set-output name=VERSION::$(echo ${{ github.event.release.tag_name }} | grep -E "^[0-9]+.[0-9]+(-rc[0-9]+)?$" | cut -f 1,2 -d . | cut -f 1 -d -)
+        run: echo ::set-output name=VERSION::$(echo ${{ github.event.release.tag_name }} | awk -F '[.-]' '/^[0-9]+.[0-9]+[.0-9]*(-rc[0-9]+)?$/ {print $1 "." $2}')
 
       - name: Set image version and force image action for release
         if: github.event_name == 'release' && steps.get_release_version.outputs.VERSION != ''
@@ -48,9 +48,16 @@ jobs:
           echo "FORCE_IMAGE_ACTION=rebuild" >> $GITHUB_ENV
 
       - name: Set image version and force image action for stable branch
-        if: startsWith(github.ref, 'refs/heads/stable-')
+        # we want to set IMG_VER to e.g. '1.x' for stable branches and PRs against them
+        # for PRs we have to use 'base_ref' - this is the target branch (and we have to check that instead)
+        if:
+          startsWith(github.ref, 'refs/heads/stable-') || startsWith(github.base_ref, 'stable-')
+        # we now know we're on (or against) stable branches, so we just need to pick the version (e.g. the mentioned '1.x')
         run: |
-          echo "IMG_VER=$(echo ${GITHUB_REF#refs/heads/} | cut -d - -f 2)" >> $GITHUB_ENV
+          IMG_VER=$(echo ${GITHUB_BASE_REF} | cut -d - -f 2)
+          [ -z "${IMG_VER}" ] \
+              && echo "IMG_VER=$(echo ${GITHUB_REF#refs/heads/} | cut -d - -f 2)" >> $GITHUB_ENV \
+              || echo "IMG_VER=${IMG_VER}" >> $GITHUB_ENV
           echo "FORCE_IMAGE_ACTION=rebuild" >> $GITHUB_ENV
 
       - name: Clone the git repo
@@ -64,6 +71,7 @@ jobs:
 
       - name: Run the build
         run: cd $WORKDIR && ${{ matrix.CONFIG }} ./build.sh
+
   doc:
     name: build and publish docs
     runs-on: ubuntu-latest
@@ -79,6 +87,12 @@ jobs:
       matrix:
         CONFIG: ["TYPE=doc OS=fedora OS_VER=32"]
     steps:
+      - name: Set image version for stable branch
+        # doc update happens only on stable branch (not on PR), so we check only for heads ref
+        if: startsWith(github.ref, 'refs/heads/stable-')
+        run: |
+          echo "IMG_VER=$(echo ${GITHUB_REF#refs/heads/} | cut -d - -f 2)" >> $GITHUB_ENV
+
       - name: Clone the git repo
         uses: actions/checkout@v2
         with: