summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-11-15 13:13:14 -0800
committerTim Smith <tsmith@chef.io>2018-11-15 13:13:14 -0800
commitdc2767dceacc518cfef80ce23ed33ce2d770d98c (patch)
tree984c6b6038e52d1930f3ed7eda6c1d582aadc778
parent3b0f22cdb1abd2bc6c5e1ccafebe64d2a8fd0cd3 (diff)
downloadchef-dc2767dceacc518cfef80ce23ed33ce2d770d98c.tar.gz
Make sure we open PRs from chef-14 and into chef-14expeditor_chef_14
The into part was working, but we were trying to open the PR from master, which obviously doesn't work. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.expeditor/update_dep.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/.expeditor/update_dep.sh b/.expeditor/update_dep.sh
index 656c2346ca..6114e71b73 100644
--- a/.expeditor/update_dep.sh
+++ b/.expeditor/update_dep.sh
@@ -11,8 +11,10 @@
set -evx
-branch="expeditor/${GEM_NAME}_${VERSION}"
-git checkout -b "$branch"
+release_branch="chef-14"
+new_branch="expeditor/${GEM_NAME}_${VERSION}"
+git checkout "$release_branch"
+git checkout -b "$new_branch"
bundle install
@@ -29,8 +31,8 @@ git add .
# DCO sign-off is needed for this sort of PR since it contains no intellectual property
git commit --message "Bump $GEM_NAME to $VERSION" --message "This pull request was triggered automatically via Expeditor when $GEM_NAME $VERSION was promoted to Rubygems." --message "This change falls under the obvious fix policy so no Developer Certificate of Origin (DCO) sign-off is required."
-open_pull_request "chef-14"
+open_pull_request "$release_branch"
# Get back to master and cleanup the leftovers - any changed files left over at the end of this script will get committed to master.
git checkout -
-git branch -D "$branch"
+git branch -D "$new_branch"