Merge release commit into master (#39)

* Merge release commit into master Signed-off-by: Juraci Paixão Kröhling <[email protected]> * Only publish images under specific situations Signed-off-by: Juraci Paixão Kröhling <[email protected]>
jaegertracing · Sep 21, 2018 · 6883c81 · 6883c81
1 parent f8c1af1
commit 6883c81
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,11 @@ go:
 stages:
   - name: build
   - name: deploy
-    if: type != pull_request
+    # only deploy if:
+    ## we are not in a PR
+    ## tag is blank (ie, master or any other branch)
+    ## tag is a release tag (release/v1.6.1, which is the release build)
+    if: (type != pull_request) AND ((tag IS blank) OR (tag =~ /^release\/v.[\d\.]+(\-.*)?$/))
 
 jobs:
   include:

diff --git a/.travis/release.sh b/.travis/release.sh
@@ -22,4 +22,9 @@ else
     git commit -qm "Release ${TAG}" --author="Jaeger Release <[email protected]>"
     git tag ${TAG}
     git push --tags --repo=https://${GH_WRITE_TOKEN}@github.com/jaegertracing/jaeger-operator.git
+
+    ## release commit should reach master!
+    git checkout master
+    git merge ${TAG}
+    git push --repo=https://${GH_WRITE_TOKEN}@github.com/jaegertracing/jaeger-operator.git
 fi
diff --git a/RELEASE.adoc b/RELEASE.adoc
@@ -8,5 +8,6 @@
 
 1. Tag and push
 
-  git tag release/1.6.1
+  git checkout master ## it's only possible to release from master for now!
+  git tag release/v1.6.1
   git push [email protected]:jaegertracing/jaeger-operator.git release/v1.6.1