GitHub Actions: add branch name to docker image name

Unless we're on master.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

.github/workflows/android-dockerimage.yml

@@ -25,7 +25,10 @@ jobs:
     - name: set env
       run: |
         v=${{ env.VERSION }}
-        echo "::set-env name=NAME::subsurface/android-build-container:${v}"
+        b=${{ github.ref }} # -BRANCH suffix, unless the branch is master
+        b=${b/refs\/heads\//}
+        if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
+        echo "::set-env name=NAME::subsurface/android-build-container${b}:${v}"
 
     - name: Build and Publish Linux Docker image to Dockerhub
       uses: elgohr/Publish-Docker-Github-Action@master

.github/workflows/linux-dockerimage.yml

@@ -23,7 +23,10 @@ jobs:
     - name: set env
       run: |
         v=${{ env.VERSION }}
-        echo "::set-env name=NAME::subsurface/trusty-qt512:${v}"
+        b=${{ github.ref }} # -BRANCH suffix, unless the branch is master
+        b=${b/refs\/heads\//}
+        if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
+        echo "::set-env name=NAME::subsurface/trusty-qt512${b}:${v}"
 
     - name: Build and Publish Linux Docker image to Dockerhub
       uses: elgohr/Publish-Docker-Github-Action@master

.github/workflows/mxe-dockerimage-stage1.yml

@@ -26,7 +26,10 @@ jobs:
       run: |
         v=${{ env.VERSION }}
         s=".stage1"
-        echo "::set-env name=NAME::subsurface/mxe-build-container:${v}${s}"
+        b=${{ github.ref }} # -BRANCH suffix, unless the branch is master
+        b=${b/refs\/heads\//}
+        if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
+        echo "::set-env name=NAME::subsurface/mxe-build-container${b}:${v}${s}"
 
     - name: Build and Publish stage 1 Docker image to Dockerhub
       uses: elgohr/Publish-Docker-Github-Action@master

.github/workflows/mxe-dockerimage-stage2.yml

@@ -21,8 +21,11 @@ jobs:
       run: |
         v=${{ github.event.action }}
         s=".stage1"
+        b=${{ github.event.client_payload.target_branc }} # -BRANCH suffix, unless the branch is master
+        b=${b/refs\/heads\//}
+        if [ $b = "master" ] ; then b="" ; else b="-$b" ; fi
         echo "::set-env name=VERSION::${v}${s}"
-        echo "::set-env name=NAME::subsurface/mxe-build-container:${v}"
+        echo "::set-env name=NAME::subsurface/mxe-build-container${b}:${v}"
 
     - name: Build and Publish stage 2 Docker image to Dockerhub
       uses: elgohr/Publish-Docker-Github-Action@master