[camel-k] tag 0.0.1 updated (6983986 -> e05d842)

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel-k] tag 0.0.1 updated (6983986 -> e05d842)

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

nferraro pushed a change to tag 0.0.1
in repository https://gitbox.apache.org/repos/asf/camel-k.git.


*** WARNING: tag 0.0.1 was modified! ***

    from 6983986  (commit)
      to e05d842  (commit)
 discard 6983986  Release 0.0.1
     new 1c9bf26  Update release with git tag step
     new 876365c  reset version to snapshot
     new e05d842  Release 0.0.1

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
tag are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (6983986)
            \
             N -- N -- N   refs/tags/0.0.1 (e05d842)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build/Makefile   |  5 ++++-
 build/git_tag.sh | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100755 build/git_tag.sh

Reply | Threaded
Open this post in threaded view
|

[camel-k] 01/03: Update release with git tag step

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

nferraro pushed a commit to tag 0.0.1
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 1c9bf2604908dd69833696505e43ab403b064267
Author: nferraro <[hidden email]>
AuthorDate: Thu Sep 13 19:13:04 2018 +0200

    Update release with git tag step
---
 build/Makefile                  |  5 ++++-
 build/git_tag.sh                | 15 +++++++++++++++
 deploy/operator-deployment.yaml |  2 +-
 deploy/resources.go             |  2 +-
 runtime/jvm/pom.xml             |  2 +-
 runtime/pom.xml                 |  2 +-
 version/version.go              |  2 +-
 7 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/build/Makefile b/build/Makefile
index 28c52a3..fde80b2 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -12,7 +12,7 @@ build-embed-resources:
 build-runtime:
  mvn clean install -f ./runtime/pom.xml
 
-release: prepare-release build images-build images-push test-integration cross-compile
+release: prepare-release build images-build images-push test-integration cross-compile git-tag
 
 prepare-release:
  ./build/prepare_release.sh
@@ -20,6 +20,9 @@ prepare-release:
 cross-compile:
  ./build/cross_compile.sh
 
+git-tag:
+ ./build/git_tag.sh
+
 dep:
  dep ensure -v
 
diff --git a/build/git_tag.sh b/build/git_tag.sh
new file mode 100755
index 0000000..d1d3adb
--- /dev/null
+++ b/build/git_tag.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+location=$(dirname $0)
+version=$($location/get_version.sh)
+
+git branch -D staging-$version || true
+git checkout -b staging-$version
+git add * || true
+git commit -m "Release $version"
+git tag --force $version staging-$version
+git push --force upstream $version
+
+echo "Tag $version pushed upstream"
diff --git a/deploy/operator-deployment.yaml b/deploy/operator-deployment.yaml
index 265b76d..df67a73 100644
--- a/deploy/operator-deployment.yaml
+++ b/deploy/operator-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       serviceAccountName: camel-k-operator
       containers:
         - name: camel-k-operator
-          image: docker.io/apache/camel-k:0.0.1-SNAPSHOT
+          image: docker.io/apache/camel-k:0.0.1
           ports:
           - containerPort: 60000
             name: metrics
diff --git a/deploy/resources.go b/deploy/resources.go
index c0b8bbf..725558c 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -113,7 +113,7 @@ spec:
       serviceAccountName: camel-k-operator
       containers:
         - name: camel-k-operator
-          image: docker.io/apache/camel-k:0.0.1-SNAPSHOT
+          image: docker.io/apache/camel-k:0.0.1
           ports:
           - containerPort: 60000
             name: metrics
diff --git a/runtime/jvm/pom.xml b/runtime/jvm/pom.xml
index 1aeb457..93347db 100644
--- a/runtime/jvm/pom.xml
+++ b/runtime/jvm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.camel.k</groupId>
         <artifactId>camel-k-runtime-parent</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/runtime/pom.xml b/runtime/pom.xml
index fb7cd42..3f17431 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.apache.camel.k</groupId>
     <artifactId>camel-k-runtime-parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.1</version>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/version/version.go b/version/version.go
index f656e8a..a1df73c 100644
--- a/version/version.go
+++ b/version/version.go
@@ -20,5 +20,5 @@ package version
 
 var (
  // Global Camel K Version
- Version = "0.0.1-SNAPSHOT"
+ Version = "0.0.1"
 )

Reply | Threaded
Open this post in threaded view
|

[camel-k] 02/03: reset version to snapshot

nferraro
In reply to this post by nferraro
This is an automated email from the ASF dual-hosted git repository.

nferraro pushed a commit to tag 0.0.1
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 876365ceb0d8f3d90c6539b2f18cd32314aebf43
Author: nferraro <[hidden email]>
AuthorDate: Thu Sep 13 20:17:33 2018 +0200

    reset version to snapshot
---
 deploy/operator-deployment.yaml | 2 +-
 deploy/resources.go             | 2 +-
 runtime/jvm/pom.xml             | 2 +-
 runtime/pom.xml                 | 2 +-
 version/version.go              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/deploy/operator-deployment.yaml b/deploy/operator-deployment.yaml
index df67a73..265b76d 100644
--- a/deploy/operator-deployment.yaml
+++ b/deploy/operator-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       serviceAccountName: camel-k-operator
       containers:
         - name: camel-k-operator
-          image: docker.io/apache/camel-k:0.0.1
+          image: docker.io/apache/camel-k:0.0.1-SNAPSHOT
           ports:
           - containerPort: 60000
             name: metrics
diff --git a/deploy/resources.go b/deploy/resources.go
index 725558c..c0b8bbf 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -113,7 +113,7 @@ spec:
       serviceAccountName: camel-k-operator
       containers:
         - name: camel-k-operator
-          image: docker.io/apache/camel-k:0.0.1
+          image: docker.io/apache/camel-k:0.0.1-SNAPSHOT
           ports:
           - containerPort: 60000
             name: metrics
diff --git a/runtime/jvm/pom.xml b/runtime/jvm/pom.xml
index 93347db..1aeb457 100644
--- a/runtime/jvm/pom.xml
+++ b/runtime/jvm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.camel.k</groupId>
         <artifactId>camel-k-runtime-parent</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/runtime/pom.xml b/runtime/pom.xml
index 3f17431..fb7cd42 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.apache.camel.k</groupId>
     <artifactId>camel-k-runtime-parent</artifactId>
-    <version>0.0.1</version>
+    <version>0.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/version/version.go b/version/version.go
index a1df73c..f656e8a 100644
--- a/version/version.go
+++ b/version/version.go
@@ -20,5 +20,5 @@ package version
 
 var (
  // Global Camel K Version
- Version = "0.0.1"
+ Version = "0.0.1-SNAPSHOT"
 )

Reply | Threaded
Open this post in threaded view
|

[camel-k] 03/03: Release 0.0.1

nferraro
In reply to this post by nferraro
This is an automated email from the ASF dual-hosted git repository.

nferraro pushed a commit to tag 0.0.1
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit e05d842b9195db077f4cced98e514434e060b307
Author: nferraro <[hidden email]>
AuthorDate: Thu Sep 13 20:28:19 2018 +0200

    Release 0.0.1
---
 deploy/operator-deployment.yaml | 2 +-
 deploy/resources.go             | 2 +-
 runtime/jvm/pom.xml             | 2 +-
 runtime/pom.xml                 | 2 +-
 version/version.go              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/deploy/operator-deployment.yaml b/deploy/operator-deployment.yaml
index 265b76d..df67a73 100644
--- a/deploy/operator-deployment.yaml
+++ b/deploy/operator-deployment.yaml
@@ -17,7 +17,7 @@ spec:
       serviceAccountName: camel-k-operator
       containers:
         - name: camel-k-operator
-          image: docker.io/apache/camel-k:0.0.1-SNAPSHOT
+          image: docker.io/apache/camel-k:0.0.1
           ports:
           - containerPort: 60000
             name: metrics
diff --git a/deploy/resources.go b/deploy/resources.go
index c0b8bbf..725558c 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -113,7 +113,7 @@ spec:
       serviceAccountName: camel-k-operator
       containers:
         - name: camel-k-operator
-          image: docker.io/apache/camel-k:0.0.1-SNAPSHOT
+          image: docker.io/apache/camel-k:0.0.1
           ports:
           - containerPort: 60000
             name: metrics
diff --git a/runtime/jvm/pom.xml b/runtime/jvm/pom.xml
index 1aeb457..93347db 100644
--- a/runtime/jvm/pom.xml
+++ b/runtime/jvm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.camel.k</groupId>
         <artifactId>camel-k-runtime-parent</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/runtime/pom.xml b/runtime/pom.xml
index fb7cd42..3f17431 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.apache.camel.k</groupId>
     <artifactId>camel-k-runtime-parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.1</version>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/version/version.go b/version/version.go
index f656e8a..a1df73c 100644
--- a/version/version.go
+++ b/version/version.go
@@ -20,5 +20,5 @@ package version
 
 var (
  // Global Camel K Version
- Version = "0.0.1-SNAPSHOT"
+ Version = "0.0.1"
 )