From 22d71631c7a6e0e0ea8aef434263321d65975c29 Mon Sep 17 00:00:00 2001
From: Jorge Turrado Ferrero <jorge.turrado@docplanner.com>
Date: Thu, 25 Nov 2021 18:04:53 +0100
Subject: [PATCH] Revert GH action change and fix makefile (#2350)

Signed-off-by: Jorge Turrado <jorge.turrado@docplanner.com>
---
 .github/workflows/release-build.yml | 17 +++++++----------
 Makefile                            |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index eb614055007..046917eb25e 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -52,26 +52,23 @@ jobs:
         run: echo $DOCKER_HUB_ACCESS_TOKEN | docker login -u $DOCKER_HUB_USERNAME --password-stdin
 
       - name: Get the version
-        uses: little-core-labs/get-git-tag@v3.0.1
         id: get_version
-        with:
-          tagRegex: "v(.*)"  
-          tagRegexGroup: 1
+        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/v}
 
       - name: Release Deployment YAML file
         run: make release
         env:
-          VERSION: ${{ steps.get_version.outputs.tag }}
+          VERSION: ${{ steps.get_version.outputs.VERSION }}
 
       - name: Publish KEDA images on GitHub Container Registry
         run: make publish
         env:
-          VERSION: ${{ steps.get_version.outputs.tag }}
+          VERSION: ${{ steps.get_version.outputs.VERSION }}
 
       - name: Publish KEDA images on Docker Hub
         run: make publish-dockerhub
         env:
-          VERSION: ${{ steps.get_version.outputs.tag }}
+          VERSION: ${{ steps.get_version.outputs.VERSION }}
 
         # Get release information to determine id of the current release
       - name: Get Release
@@ -87,7 +84,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: https://uploads.github.com/repos/kedacore/keda/releases/${{ steps.get-release-info.outputs.id }}/assets?name=keda-${{ steps.get_version.outputs.tag }}.yaml
-          asset_path: keda-${{ steps.get_version.outputs.tag }}.yaml
-          asset_name: keda-${{ steps.get_version.outputs.tag }}.yaml
+          upload_url: https://uploads.github.com/repos/kedacore/keda/releases/${{ steps.get-release-info.outputs.id }}/assets?name=keda-${{ steps.get_version.outputs.VERSION }}.yaml
+          asset_path: keda-${{ steps.get_version.outputs.VERSION }}.yaml
+          asset_name: keda-${{ steps.get_version.outputs.VERSION }}.yaml
           asset_content_type: application/x-yaml
diff --git a/Makefile b/Makefile
index bc70143e24a..4700f180e82 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ SHELL           = /bin/bash
 
 # If E2E_IMAGE_TAG is defined, we are on pr e2e test and we have to use the new tag and append -test to the repository
 ifeq '${E2E_IMAGE_TAG}' ''
-VERSION = main
+VERSION ?= main
 # SUFIX here is intentional empty to not append nothing to the repository
 SUFFIX =
 endif