This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit b5ef7f363c04c8a023ec0816f3540c9ecb2231ff
Author: Tadayoshi Sato <sato.tadayo...@gmail.com>
AuthorDate: Tue May 31 15:41:53 2022 +0900
fix(ci): let's support Camel K 10+ versions
---
.github/actions/kamel-build-bundle/build-bundle-image.sh | 4 ++--
.github/actions/kamel-build-bundle/build-index-image.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/actions/kamel-build-bundle/build-bundle-image.sh
b/.github/actions/kamel-build-bundle/build-bundle-image.sh
index 4ad2e7b6e..217c0cdf9 100755
--- a/.github/actions/kamel-build-bundle/build-bundle-image.sh
+++ b/.github/actions/kamel-build-bundle/build-bundle-image.sh
@@ -106,9 +106,9 @@ popd
export
LOCAL_IMAGE_BUNDLE=${REGISTRY_PUSH_HOST}/${IMAGE_NAMESPACE}/camel-k-bundle:${IMAGE_VERSION}
export CUSTOM_IMAGE=${IMAGE_NAME}
-export PREV_XY_CHANNEL="stable-$(make get-last-released-version | grep -Po
'\d.\d+')"
+export PREV_XY_CHANNEL="stable-$(make get-last-released-version | grep -Po
'\d+\.\d+')"
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-$(make get-version | grep -Po "\d+\.\d+")
echo "NEW_XY_CHANNEL=${NEW_XY_CHANNEL}" >> $GITHUB_ENV
make bundle-build \
diff --git a/.github/actions/kamel-build-bundle/build-index-image.sh
b/.github/actions/kamel-build-bundle/build-index-image.sh
index 146d08ba4..0078928fc 100755
--- a/.github/actions/kamel-build-bundle/build-index-image.sh
+++ b/.github/actions/kamel-build-bundle/build-index-image.sh
@@ -211,10 +211,10 @@ cat << EOF >> ${CATALOG_DIR}/camel-k.yaml
---
schema: olm.channel
package: camel-k
-name: stable-dev-$(make get-version | grep -Po "\d.\d+")
+name: stable-dev-$(make get-version | grep -Po "\d+\.\d+")
entries:
- name: $(make get-csv-name)
- replaces: $(make get-last-released-img-name).v$(make
get-last-released-version | grep -Po "\d.\d+.\d+")
+ replaces: $(make get-last-released-img-name).v$(make
get-last-released-version | grep -Po "\d+\.\d+\.\d+")
EOF
#
