You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2018/09/14 08:49:23 UTC

[camel-k] 01/05: Fix release scripts

This is an automated email from the ASF dual-hosted git repository.

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit eeef530085eb823c8e50062809e1f9af1b0b0629
Author: nferraro <ni...@gmail.com>
AuthorDate: Thu Sep 13 17:58:50 2018 +0200

    Fix release scripts
---
 build/Makefile           | 6 ++----
 build/images_build.sh    | 6 ++++++
 build/images_push.sh     | 6 ++++++
 build/prepare_release.sh | 1 +
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/build/Makefile b/build/Makefile
index 335b9c0..28c52a3 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -1,5 +1,3 @@
-VERSION := $(shell ./build/get_version.sh)
-
 build: build-runtime build-operator build-kamel test
 
 build-operator: build-embed-resources
@@ -41,10 +39,10 @@ codegen:
 images: images-build
 
 images-build:
-	./build/package_maven_artifacts.sh && operator-sdk build docker.io/apache/camel-k:$(VERSION)
+	./build/images_build.sh
 
 images-push:
-	docker push docker.io/apache/camel-k:$(VERSION)
+	./build/images_push.sh
 
 test: check
 check:
diff --git a/build/images_build.sh b/build/images_build.sh
new file mode 100755
index 0000000..7aefdc2
--- /dev/null
+++ b/build/images_build.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+location=$(dirname $0)
+version=$($location/get_version.sh)
+
+$location/package_maven_artifacts.sh && operator-sdk build docker.io/apache/camel-k:$version
\ No newline at end of file
diff --git a/build/images_push.sh b/build/images_push.sh
new file mode 100755
index 0000000..2b7eab9
--- /dev/null
+++ b/build/images_push.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+location=$(dirname $0)
+version=$($location/get_version.sh)
+
+docker push docker.io/apache/camel-k:$version
\ No newline at end of file
diff --git a/build/prepare_release.sh b/build/prepare_release.sh
index cd8894c..b9d5881 100755
--- a/build/prepare_release.sh
+++ b/build/prepare_release.sh
@@ -7,6 +7,7 @@ global_version_file=$location/../version/version.go
 
 # Set the new global version by removing "-SNAPSHOT"
 sed -i "s/-SNAPSHOT//g" $global_version_file
+find $location/../deploy -type f -exec sed -i "s/-SNAPSHOT//g" {} \;
 
 # Get the new version
 version=$($location/get_version.sh)