Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release commit into master #39

Merged
merged 2 commits into from
Sep 21, 2018
Merged

Merge release commit into master #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47bef47
Merge release commit into master
jpkrohling Sep 21, 2018
59c91df
Only publish images under specific situations
jpkrohling Sep 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions .travis/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion RELEASE.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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