You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2021/01/14 12:27:34 UTC
[camel-k] branch master updated: chore: Remove duplicated version
target in Makefile
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new 4e0cb8e chore: Remove duplicated version target in Makefile
4e0cb8e is described below
commit 4e0cb8e19575828f2d4c79920efaa4aaad7872b2
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Thu Jan 14 11:47:31 2021 +0100
chore: Remove duplicated version target in Makefile
---
.github/workflows/builder.yml | 6 +++---
.github/workflows/knative.yml | 12 ++++++------
.github/workflows/kubernetes.yml | 6 +++---
.github/workflows/openshift.yml | 2 +-
.github/workflows/stale.yaml | 6 +++---
script/Makefile | 9 +++------
6 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 59230db..9fcd714 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -87,7 +87,7 @@ jobs:
mkdir -p ./build/_output/bin
cp ./kamel ./build/_output/bin/
echo "Building the images"
- export LOCAL_IMAGE=$KIND_REGISTRY/apache/camel-k:$(make version)
+ export LOCAL_IMAGE=$KIND_REGISTRY/apache/camel-k:$(make get-version)
docker build -t "${LOCAL_IMAGE}" -f build/Dockerfile .
docker push ${LOCAL_IMAGE}
@@ -110,11 +110,11 @@ jobs:
export KAMEL_INSTALL_MAVEN_REPOSITORIES=$(make get-staging-repo)
export KAMEL_INSTALL_REGISTRY=$KIND_REGISTRY
export KAMEL_INSTALL_REGISTRY_INSECURE=true
- export KAMEL_INSTALL_OPERATOR_IMAGE=$KIND_REGISTRY/apache/camel-k:$(make version)
+ export KAMEL_INSTALL_OPERATOR_IMAGE=$KIND_REGISTRY/apache/camel-k:$(make get-version)
# Configure test options
export CAMEL_K_TEST_IMAGE_NAME=$KIND_REGISTRY/apache/camel-k
- export CAMEL_K_TEST_IMAGE_VERSION=$(make version)
+ export CAMEL_K_TEST_IMAGE_VERSION=$(make get-version)
# Then run integration tests
make test-builder
diff --git a/.github/workflows/knative.yml b/.github/workflows/knative.yml
index 7380641..d443060 100644
--- a/.github/workflows/knative.yml
+++ b/.github/workflows/knative.yml
@@ -125,7 +125,7 @@ jobs:
mkdir -p ./build/_output/bin
cp ./kamel ./build/_output/bin/
echo "Building the images"
- export LOCAL_IMAGE=$KIND_REGISTRY/apache/camel-k:$(make version)
+ export LOCAL_IMAGE=$KIND_REGISTRY/apache/camel-k:$(make get-version)
docker build -t "${LOCAL_IMAGE}" -f build/Dockerfile .
docker push ${LOCAL_IMAGE}
@@ -140,11 +140,11 @@ jobs:
export KAMEL_INSTALL_MAVEN_REPOSITORIES=$(make get-staging-repo)
export KAMEL_INSTALL_REGISTRY=$KIND_REGISTRY
export KAMEL_INSTALL_REGISTRY_INSECURE=true
- export KAMEL_INSTALL_OPERATOR_IMAGE=$KIND_REGISTRY/apache/camel-k:$(make version)
+ export KAMEL_INSTALL_OPERATOR_IMAGE=$KIND_REGISTRY/apache/camel-k:$(make get-version)
# Configure test options
export CAMEL_K_TEST_IMAGE_NAME=$KIND_REGISTRY/apache/camel-k
- export CAMEL_K_TEST_IMAGE_VERSION=$(make version)
+ export CAMEL_K_TEST_IMAGE_VERSION=$(make get-version)
# Then run integration tests
make test-knative
@@ -245,7 +245,7 @@ jobs:
mkdir -p ./build/_output/bin
cp ./kamel ./build/_output/bin/
echo "Building the images"
- export LOCAL_IMAGE=$KIND_REGISTRY/apache/camel-k:$(make version)
+ export LOCAL_IMAGE=$KIND_REGISTRY/apache/camel-k:$(make get-version)
docker build -t "${LOCAL_IMAGE}" -f build/Dockerfile .
docker push ${LOCAL_IMAGE}
@@ -260,11 +260,11 @@ jobs:
export KAMEL_INSTALL_MAVEN_REPOSITORIES=$(make get-staging-repo)
export KAMEL_INSTALL_REGISTRY=$KIND_REGISTRY
export KAMEL_INSTALL_REGISTRY_INSECURE=true
- export KAMEL_INSTALL_OPERATOR_IMAGE=$KIND_REGISTRY/apache/camel-k:$(make version)
+ export KAMEL_INSTALL_OPERATOR_IMAGE=$KIND_REGISTRY/apache/camel-k:$(make get-version)
# Configure test options
export CAMEL_K_TEST_IMAGE_NAME=$KIND_REGISTRY/apache/camel-k
- export CAMEL_K_TEST_IMAGE_VERSION=$(make version)
+ export CAMEL_K_TEST_IMAGE_VERSION=$(make get-version)
# Install Yaks globally
yaks install
diff --git a/.github/workflows/kubernetes.yml b/.github/workflows/kubernetes.yml
index 2401352..ce955af 100644
--- a/.github/workflows/kubernetes.yml
+++ b/.github/workflows/kubernetes.yml
@@ -83,7 +83,7 @@ jobs:
mkdir -p ./build/_output/bin
cp ./kamel ./build/_output/bin/
echo "Building the images"
- export LOCAL_IMAGE=$KIND_REGISTRY/apache/camel-k:$(make version)
+ export LOCAL_IMAGE=$KIND_REGISTRY/apache/camel-k:$(make get-version)
docker build -t "${LOCAL_IMAGE}" -f build/Dockerfile .
docker push ${LOCAL_IMAGE}
@@ -105,11 +105,11 @@ jobs:
export KAMEL_INSTALL_MAVEN_REPOSITORIES=$(make get-staging-repo)
export KAMEL_INSTALL_REGISTRY=$KIND_REGISTRY
export KAMEL_INSTALL_REGISTRY_INSECURE=true
- export KAMEL_INSTALL_OPERATOR_IMAGE=$KIND_REGISTRY/apache/camel-k:$(make version)
+ export KAMEL_INSTALL_OPERATOR_IMAGE=$KIND_REGISTRY/apache/camel-k:$(make get-version)
# Configure test options
export CAMEL_K_TEST_IMAGE_NAME=$KIND_REGISTRY/apache/camel-k
- export CAMEL_K_TEST_IMAGE_VERSION=$(make version)
+ export CAMEL_K_TEST_IMAGE_VERSION=$(make get-version)
# Then run integration tests
make test-integration
diff --git a/.github/workflows/openshift.yml b/.github/workflows/openshift.yml
index beb44e8..0e570d3 100644
--- a/.github/workflows/openshift.yml
+++ b/.github/workflows/openshift.yml
@@ -150,7 +150,7 @@ jobs:
cp ./kamel ./build/_output/bin/
echo "Building the images"
- export IMAGE=docker.io/apache/camel-k:$(make version)
+ export IMAGE=docker.io/apache/camel-k:$(make get-version)
docker build -t "${IMAGE}" -f build/Dockerfile .
# Make the Apache Snapshots or Apache Staging repository enabled by default
diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
index 5a9e9d8..54fe762 100644
--- a/.github/workflows/stale.yaml
+++ b/.github/workflows/stale.yaml
@@ -36,9 +36,9 @@ jobs:
stale-issue-label: stale
exempt-issue-label: never-stale
stale-issue-message: |
- This issue is stale because it has been open 30 days with no activity.
- Remove stale label or comment or this will be closed in 7 days.
- stale-pr-label: stale
+ This issue is stale because it has been open 30 days with no activity.
+ Remove stale label or comment or this will be closed in 7 days.
+ stale-pr-label: stale
exempt-pr-label: never-stale
stale-pr-message: |
This PR is stale because it has been open 30 days with no activity.
diff --git a/script/Makefile b/script/Makefile
index d3b5c3a..ff23089 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -196,9 +196,6 @@ clean:
rm -rf camel-k-client-*.tar.gz
rm -rf camel-k-examples-*.tar.gz
-version:
- @echo $(VERSION)
-
dep:
go mod tidy
@@ -239,6 +236,9 @@ images-push-staging:
docker tag $(IMAGE_NAME):$(VERSION) $(STAGING_IMAGE_NAME):$(VERSION)
docker push $(STAGING_IMAGE_NAME):$(VERSION)
+get-version:
+ @echo $(VERSION)
+
set-version:
./script/set_version.sh $(VERSION) $(IMAGE_NAME)
@@ -282,9 +282,6 @@ release-notes:
get-staging-repo:
@echo $(or ${STAGING_RUNTIME_REPO},https://repository.apache.org/content/repositories/snapshots@id=apache-snapshots@snapshots)
-get-version:
- @echo $(VERSION)
-
.PHONY: build build-kamel build-resources build-olm unsnapshot-olm dep codegen images images-dev images-push images-push-staging test check test-integration clean release cross-compile package-examples set-version git-tag release-notes check-licenses generate-deepcopy generate-client generate-doc build-resources release-helm release-staging release-nightly get-staging-repo get-version build-submodules set-module-version bundle-kamelets generate-strimzi
# find or download controller-gen if necessary