12-package.json: update when release candidate created
This commit is contained in:
@@ -19,15 +19,15 @@ module Release
|
||||
end
|
||||
|
||||
release_branch = current_branch
|
||||
|
||||
|
||||
error "Missing confirmation of branch: #{release_branch}" if confirmation_branch == ''
|
||||
error "Confirmation branch does not match current branch: #{confirmation_branch} vs #{release_branch}" if release_branch != confirmation_branch
|
||||
validate_current_branch_is_release
|
||||
|
||||
git_checkout 'master'
|
||||
git_fetch_and_merge current_branch
|
||||
git_checkout :master
|
||||
git_fetch_and_merge :master
|
||||
|
||||
git_local_branch_trash current_branch
|
||||
git_local_branch_trash release_branch
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user