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.

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

Fix bugs in script/release-publish. #42

Merged
merged 1 commit into from
Dec 6, 2016
Merged

Fix bugs in script/release-publish. #42

merged 1 commit into from
Dec 6, 2016

Conversation

qiwzhang
Copy link
Contributor

@qiwzhang qiwzhang commented Dec 6, 2016

No description provided.

@@ -80,7 +80,7 @@ set -x
VERSION="$(command cat ${ROOT}/include/version)" \
|| error_exit "Cannot find release version (${ROOT}/include/version)"
CURRENT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
if RELEASE_BRANCH_SHA="$(git rev-parse origin/${CURRENT_BRANCH})"; then
if RELEASE_BRANCH_SHA="$(git rev-parse upstream/${CURRENT_BRANCH})"; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't change this, the git-remote upstream only exists in your local, in CI "origin" is pointed to cloudendpoints/esp.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't get run on jenkins, does it?
It should be upstream not origin.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yo u are right, but I'm not convinced it should be "upstream", the name "upstream" is just a convention and not git standard.

Probably use git ls-remote --heads https://github.com/cloudendpoints/esp ${CURRENT_BRANCH}? Need to process the output a bit though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this is only run manually by release engineer.
Yes, by convension it is "upstream". "origin" is your fork which may not have v1.0.x branch yet.

This is just for convenient check. Even if your "upstream" remote is not called with the name, it is OK, the script will just print warning.

@qiwzhang qiwzhang merged commit 01f3625 into cloudendpoints:master Dec 6, 2016
@qiwzhang qiwzhang deleted the release_publish branch December 6, 2016 21:30
qiwzhang added a commit that referenced this pull request Dec 7, 2016
* Fix bugs in script/release-publish. (#42)

* Change script/release_tag_git to use upstream.

* Update release-tag-git to use absolute repo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants