Fix PRE_VERSION in Makefile (#1625)

* Fix make print-PREV_VERSION

* Use latest Makefile while running operator-hub publish
This commit is contained in:
Hao Liu
2023-11-08 11:40:24 -05:00
committed by GitHub
parent 0fb252b6e4
commit a69ca7f8b5
2 changed files with 4 additions and 1 deletions

View File

@@ -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 }}

View File

@@ -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