Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ci): camel kamelets catalog scraping #4136

Merged
merged 1 commit into from
Mar 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/automatic-updates/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ runs:
run: |
make generate
make update-docs
make update-default-ck-runtime
make update-default-camel
git add -A && git commit -m 'chore: nightly resource refresh' && echo "refresh=1" >> $GITHUB_ENV || echo "No changes to make update-docs"
- name: Push changes
shell: bash
Expand Down
8 changes: 4 additions & 4 deletions script/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ VERSIONFILE := pkg/util/defaults/defaults.go
VERSION ?= 2.0.0-SNAPSHOT
LAST_RELEASED_IMAGE_NAME := camel-k-operator
LAST_RELEASED_VERSION ?= 1.12.0
RUNTIME_VERSION := 1.18.0-SNAPSHOT
RUNTIME_VERSION := 3.20.1-SNAPSHOT
BUILDAH_VERSION := 1.23.3
KANIKO_VERSION := 1.9.1
CONTROLLER_GEN_VERSION := v0.6.1
Expand Down Expand Up @@ -86,7 +86,7 @@ STAGING_RUNTIME_REPO :=
INSTALL_DEFAULT_KAMELETS ?= true
KAMELET_CATALOG_REPO := https://github.com/apache/camel-kamelets.git
# Make sure to use a released tag or empty if you want to get the latest development bits
KAMELET_CATALOG_REPO_TAG := main
KAMELET_CATALOG_REPO_TAG := v3.20.1.1

# When performing integration tests, it is not necessary to always execute build, especially
# in e2e tests when lots of tests are being executed sequentially & the build has already taken place.
Expand Down Expand Up @@ -143,8 +143,8 @@ default: build
update-docs: build-resources
./script/update_docs.sh

update-default-ck-runtime:
./script/update_defaults_ck_runtime.sh
update-default-camel:
./script/update_default_camel.sh

bump-replace:
@# Bump version and replace with the variables provided by the user
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,14 @@ git clone --depth 1 https://github.com/apache/camel-k-runtime.git /tmp/camel-k-r
ck_runtime_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout -f /tmp/camel-k-runtime/pom.xml)
echo "INFO: last Camel K runtime version set at $ck_runtime_version"
sed -i "s/^RUNTIME_VERSION := .*$/RUNTIME_VERSION := $ck_runtime_version/" $location/Makefile
rm -rf /tmp/camel-k-runtime/

git clone https://github.com/apache/camel-kamelets.git /tmp/camel-kamelets
pushd /tmp/camel-kamelets
ck_camel_base_version=$(echo "$ck_runtime_version" | sed -r 's/-SNAPSHOT//g')
echo "INFO: Looking a suitable Kamelet tag for $ck_camel_base_version camel version"
kamelets_tag=$(git tag | grep $ck_camel_base_version | sort -r | head -n 1)
popd
echo "INFO: Kamelets version set at $kamelets_tag"
sed -i "s/^KAMELET_CATALOG_REPO_TAG := .*$/KAMELET_CATALOG_REPO_TAG := $kamelets_tag/" $location/Makefile

rm -rf /tmp/camel-k-runtime/ /tmp/camel-kamelets