You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2020/03/25 11:33:23 UTC
[camel-k] 03/04: Fix #1365: Use semantic versioning
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 454c6a7ee394e8b7382626e7d8fadec27e9d30f5
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Tue Mar 24 18:19:55 2020 +0100
Fix #1365: Use semantic versioning
---
.github/workflows/release.yml | 2 +-
script/Makefile | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1ac49d1..957f0e7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -50,7 +50,7 @@ jobs:
TEST_DOCKER_HUB_USERNAME: ${{ secrets.TEST_DOCKER_HUB_USERNAME }}
TEST_DOCKER_HUB_PASSWORD: ${{ secrets.TEST_DOCKER_HUB_PASSWORD }}
run: |
- VERSION=nightly-$(date +%Y%m%d%H%M)
+ VERSION=$(make get-version | sed s/-SNAPSHOT/-nightly.$(date +%Y%m%d%H%M)/)
echo "Using VERSION=$VERSION"
echo "::set-env name=VERSION::$VERSION"
diff --git a/script/Makefile b/script/Makefile
index 3f07d62..34b0979 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -241,4 +241,7 @@ release-notes:
get-staging-repo:
@echo $(or ${STAGING_RUNTIME_REPO},https://repository.apache.org/content/repositories/snapshots@id=apache-snapshots@snapshots)
-.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:
+ @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