Skip to content

Commit

Permalink
fix(ci): upgrade test to use stable-v2
Browse files Browse the repository at this point in the history
Closes #4855
  • Loading branch information
squakez committed Oct 24, 2023
1 parent 64d37a4 commit 77bf4f6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/actions/kamel-build-bundle/build-bundle-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
1 change: 1 addition & 0 deletions script/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 77bf4f6

Please sign in to comment.