From a69ca7f8b564988e1f9cdf31a97d71c9f1ab78f9 Mon Sep 17 00:00:00 2001
From: Hao Liu <44379968+TheRealHaoLiu@users.noreply.github.com>
Date: Wed, 8 Nov 2023 11:40:24 -0500
Subject: [PATCH] Fix PRE_VERSION in Makefile  (#1625)

* Fix make print-PREV_VERSION

* Use latest Makefile while running operator-hub publish
---
 .github/workflows/publish-operator-hub.yaml | 3 +++
 Makefile                                    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publish-operator-hub.yaml b/.github/workflows/publish-operator-hub.yaml
index 15dbaa8e..71d5288f 100644
--- a/.github/workflows/publish-operator-hub.yaml
+++ b/.github/workflows/publish-operator-hub.yaml
@@ -70,6 +70,9 @@ jobs:
           cp -f \
             awx-operator/hack/publish-to-operator-hub.sh \
             awx-operator-${{ env.TAG_NAME }}/hack/publish-to-operator-hub.sh
+          cp -f \
+            awx-operator/Makefile \
+            awx-operator-${{ env.TAG_NAME }}/Makefile
 
       - name: Build and publish bundle to operator-hub
         working-directory: awx-operator-${{ env.TAG_NAME }}
diff --git a/Makefile b/Makefile
index 25334a75..1f7e9a85 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
 VERSION ?= $(shell git describe --tags)
-PREV_VERSION ?= $(git describe --abbrev=0 --tags $(git rev-list --tags --skip=1 --max-count=1))
+PREV_VERSION ?= $(shell git describe --abbrev=0 --tags $(git rev-list --tags --skip=1 --max-count=1))
 
 CONTAINER_CMD ?= docker