diff options
author | Damien Martin-Guillerez <dmarting@google.com> | 2017-01-26 13:22:31 +0000 |
---|---|---|
committer | Laszlo Csomor <laszlocsomor@google.com> | 2017-01-26 14:53:53 +0000 |
commit | 015edb05335fa26a2021827502d368dbc154e9ae (patch) | |
tree | 0307652285e2b02cf86c104fd296dd62db5fcb58 /scripts/release | |
parent | dd04adf4877963e76ac83018b46e87ad1c3095b3 (diff) |
Rollback of commit 96297ed7a9ab3df0f45e93bae9d71833f4195334.
*** Reason for rollback ***
Roll-forward with fix
*** Original change description ***
Automated [] rollback of commit ffc0d2df0213123a4451bed5850827319afcdeee.
*** Reason for rollback ***
Grr I knew I shouldn't have done 2 changes in one tests are failing now
Fixes #2429.
*** Original change description ***
Release scripts: factor out the push to notes and fix a typo
--
PiperOrigin-RevId: 145662713
MOS_MIGRATED_REVID=145662713
Diffstat (limited to 'scripts/release')
-rwxr-xr-x | scripts/release/release.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/scripts/release/release.sh b/scripts/release/release.sh index 988c497d6d..1a17fd03ac 100755 --- a/scripts/release/release.sh +++ b/scripts/release/release.sh @@ -274,19 +274,24 @@ function push_if_exists() { fi } -# Push the release branch to the release repositories so a release -# candidate can be created. -function push_release_candidate() { - local branch="$(get_release_branch)" +# Push release notes refs but also a given ref +function push_notes_and_ref() { + local ref="$1" for repo in ${RELEASE_REPOSITORIES}; do - push_if_exists "${repo}" "${branch}" + push_if_exists "${repo}" "${ref}" push_if_exists "${repo}" "refs/notes/release" - push_if_exists "${repo}" "refs/notes/release-candidates" + push_if_exists "${repo}" "refs/notes/release-candidate" push_if_exists "${repo}" "refs/notes/release-notes" push_if_exists "${repo}" "refs/notes/cherrypick" done } +# Push the release branch to the release repositories so a release +# candidate can be created. +function push_release_candidate() { + push_notes_and_ref "$(get_release_branch)" +} + # Deletes the release branch after a release or abandoning the release function cleanup_branches() { local tag_name=$1 @@ -335,12 +340,7 @@ function do_release() { for i in $MASTER_REPOSITORIES; do git push $i +master done - for i in $RELEASE_REPOSITORIES; do - git push $i +refs/tags/${tag_name} - git push $i +refs/notes/release-candidate - git push $i +refs/notes/release - git push $i +refs/notes/release-notes - done + push_notes_and_ref "refs/tags/${tag_name}" cleanup_branches ${tag_name} fi } |