diff --git a/.github/actions/kamel-build-bundle/build-bundle-image.sh b/.github/actions/kamel-build-bundle/build-bundle-image.sh index 2b68645e15..432d378ec6 100755 --- a/.github/actions/kamel-build-bundle/build-bundle-image.sh +++ b/.github/actions/kamel-build-bundle/build-bundle-image.sh @@ -110,9 +110,9 @@ export PUSH_BUNDLE_LOCAL_IMAGE=${REGISTRY_PUSH_HOST}/${IMAGE_NAMESPACE}/${BUNDLE export CUSTOM_IMAGE=${IMAGE_NAME} export CUSTOM_VERSION=${IMAGE_VERSION} -export PREV_XY_CHANNEL="stable-$(make get-last-released-version | grep -Po '\d+\.\d+')" +export PREV_XY_CHANNEL=stable-v$(make get-last-released-version | grep -Po "\d+" | head -n 1) echo "PREV_XY_CHANNEL=${PREV_XY_CHANNEL}" >> $GITHUB_ENV -export NEW_XY_CHANNEL=stable-dev-$(make get-version | grep -Po "\d+\.\d+") +export NEW_XY_CHANNEL=stable-dev-v$(make get-version | grep -Po "\d+" | head -n 1) echo "NEW_XY_CHANNEL=${NEW_XY_CHANNEL}" >> $GITHUB_ENV echo "BUNDLE_IMAGE_NAME=${PUSH_BUNDLE_LOCAL_IMAGE}" diff --git a/script/Makefile b/script/Makefile index ac59c16923..b4561303a3 100644 --- a/script/Makefile +++ b/script/Makefile @@ -58,6 +58,7 @@ DEBUG_MODE ?= false # olm bundle vars MANAGER := config/manager MANIFESTS := config/manifests +# will provide something like "stable-v2" (only major) DEFAULT_CHANNEL ?= $(shell echo "stable-v$(word 1,$(subst ., ,$(lastword $(OPERATOR_VERSION))))") CHANNELS ?= $(DEFAULT_CHANNEL),latest PACKAGE := camel-k