12-package.json: update when release candidate created

This commit is contained in:
rkiel
2017-10-10 20:23:06 -04:00
parent f753b647d3
commit b09accebd0
6 changed files with 15 additions and 15 deletions

View File

@@ -21,7 +21,7 @@ module Release
validate_version_is_new version
update_package_json version
update_package_json version, version
git_local_tag release_tag_from_version(version)

View File

@@ -18,15 +18,13 @@ module Release
git_fetch_and_merge release_branch
update_package_json version_from_release_branch(release_branch)
git_local_tag release_tag_from_version(version_from_release_branch(release_branch))
git_push release_branch
git_push_tags
git_checkout 'master'
git_fetch_and_merge current_branch
git_checkout :master
git_fetch_and_merge :master
git_local_branch_delete release_branch

View File

@@ -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

View File

@@ -43,6 +43,8 @@ module Release
git_local_branch_create release_branch_from_version(new_version), release_tag_from_version(version)
git_push_upstream(release_branch_from_version(new_version))
update_package_json new_version, "#{new_version} started"
end
private

View File

@@ -24,8 +24,8 @@ module Release
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 release_branch