Fix tagging for 2.x "latest "release (#284)

Author: hardillb

.github/workflows/main.yml

@@ -71,15 +71,15 @@ jobs:
             IMAGE=${{ env.DEFAULT_IMAGE }}
             PUSH="true"
             VERSION=${TRAVIS_TAG:1}
-            if [ "${{ matrix.node }}" == "${{ env.LATEST_NODE }}" ] && [ "${{ matrix.suffix}}" == "" ]; then
+
+            if [[ "${{ matrix.node }}" == "${{ env.LATEST_NODE }}" && "${{ matrix.suffix }}" == "" ]]; then
               TAGS="$TAGS,$IMAGE:$VERSION,$IMAGE:latest"
-            elif [ "${{ matrix.node }}" == "${{ env.LATEST_NODE }}" ] && [ "${{ matrix.suffix}}" == "-minimal" ]; then
-              TAGS="$TAGS,$IMAGE:$VERSION,$IMAGE:latest-minimal"
-            fi
-            TAGS="$TAGS,$IMAGE:latest-${{ matrix.node }}"
-            if [ "${{ matrix.suffix}}" == "-minimal" ]; then
-              TAGS="$TAGS,$IMAGE:latest-${{ matrix.node }}${{ matrix.suffix }}"
+            elif [[ "${{ matrix.node }}" == "${{ env.LATEST_NODE }}" &&  "${{ matrix.suffix }}" == "-minimal" ]]; then
+              TAGS="$TAGS,$IMAGE:$VERSION-minimal,$IMAGE:latest-minimal"
             fi
+
+            TAGS="$TAGS,$IMAGE:latest-{{ matrix.node }}${{ matrix.suffix }}"
+
           else
             IMAGE=${{ env.DEV_IMAGE }}
             if [[ "$TRAVIS_TAG" == *"dev"*  || "$TRAVIS_TAG" == *"beta"* ]]; then
@@ -121,7 +121,7 @@ jobs:
             BUILD_DATE=${{ steps.date.outputs.date }}
             BUILD_VERSION=${{ steps.nrVersion.outputs.buildVersion }}
             BUILD_REF=${{ env.GITHUB_SHA }}
-            NODE_RED_VERSION=v${{ steps.nrVersion.outputs.version }}
+            NODE_RED_VERSION=${{ steps.nrVersion.outputs.version }}
             TAG_SUFFIX=${{ matrix.suffix }}
             
           tags: ${{ steps.nrVersion.outputs.tags }}