diff options
| author | Tim Smith <tsmith@chef.io> | 2018-11-19 09:16:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-19 09:16:10 -0800 |
| commit | abdfa74d7f34114a3584efa6f8aabe337be8d80f (patch) | |
| tree | f5ea0698dc43c4db42a3f5cfc65aa4f32e0071fe | |
| parent | 5c61b609899559962ce863b500bfde5228ff2b1c (diff) | |
| parent | dc2767dceacc518cfef80ce23ed33ce2d770d98c (diff) | |
| download | chef-abdfa74d7f34114a3584efa6f8aabe337be8d80f.tar.gz | |
Merge pull request #7944 from chef/expeditor_chef_14
Make sure we open PRs from chef-14 and into chef-14
| -rw-r--r-- | .expeditor/update_dep.sh | 10 |
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" |