29963166 by David LaPalomento

@dmlap add a contrib option to merge PRs without squashing. closes #287

1 parent 4f6eaeb6
...@@ -8,6 +8,7 @@ CHANGELOG ...@@ -8,6 +8,7 @@ CHANGELOG
8 * @gkatsev ensure segments without an initial IDR are not displayed in 4 8 * @gkatsev ensure segments without an initial IDR are not displayed in 4
9 * @mikrohard: wait for an SPS to inject metadata tags. ([view](https://github.com/videojs/videojs-contrib-hls/pull/280)) 9 * @mikrohard: wait for an SPS to inject metadata tags. ([view](https://github.com/videojs/videojs-contrib-hls/pull/280))
10 * @mikrohard: Trim whitespace in playlist. ([view](https://github.com/videojs/videojs-contrib-hls/pull/282)) 10 * @mikrohard: Trim whitespace in playlist. ([view](https://github.com/videojs/videojs-contrib-hls/pull/282))
11 * @dmlap add a contrib option to merge PRs without squashing ([view](https://github.com/videojs/videojs-contrib-hls/pull/287))
11 12
12 -------------------- 13 --------------------
13 14
......
...@@ -100,6 +100,13 @@ ...@@ -100,6 +100,13 @@
100 { "include": "update {{meta.branches.development}}" }, 100 { "include": "update {{meta.branches.development}}" },
101 { "include": "pull_request accept" } 101 { "include": "pull_request accept" }
102 ] 102 ]
103 },
104 "accept-as-is": {
105 "desc": "Merge a submitted feature without squashing commits",
106 "steps": [
107 { "include": "update {{meta.branches.development}}" },
108 { "include": "pull_request accept-as-is" }
109 ]
103 } 110 }
104 }, 111 },
105 112
...@@ -140,6 +147,13 @@ ...@@ -140,6 +147,13 @@
140 { "include": "update {{meta.branches.release}}" }, 147 { "include": "update {{meta.branches.release}}" },
141 { "include": "pull_request accept" } 148 { "include": "pull_request accept" }
142 ] 149 ]
150 },
151 "accept-as-is": {
152 "desc": "Merge a submitted patch without squashing commits",
153 "steps": [
154 { "include": "update {{meta.branches.release}}" },
155 { "include": "pull_request accept-as-is" }
156 ]
143 } 157 }
144 }, 158 },
145 159
...@@ -345,6 +359,26 @@ ...@@ -345,6 +359,26 @@
345 [ "git push upstream {{pr.base.ref}}", "Push the changes to the main project" ], 359 [ "git push upstream {{pr.base.ref}}", "Push the changes to the main project" ],
346 [ "git branch -D {{pr.user.login}}-{{pr.head.ref}}", "Delete the local branch used for merging" ] 360 [ "git branch -D {{pr.user.login}}-{{pr.head.ref}}", "Delete the local branch used for merging" ]
347 ] 361 ]
362 },
363 "accept-as-is": {
364 "steps": [
365 { "prompt": "text", "id": "prNum", "desc": "What is the the pull request number?" },
366 { "get": "{{meta.urls.repo_api}}/pulls/{{prNum}}", "desc": "Get the PR information", "id": "pr" },
367 { "get": "{{meta.urls.repo_api}}/pulls/{{prNum}}/commits", "desc": "Get the PR commits to access author info", "id": "prCommits" },
368 [ "git checkout -b {{pr.user.login}}-{{pr.head.ref}} {{pr.base.ref}}", "Create a new branch for merging the changes" ],
369 [ "git pull --rebase {{pr.head.repo.ssh_url}}", "Merge and rebase the changes"],
370 [ "grunt test", "Run tests to make sure they still pass" ],
371 { "prompt": "text", "id": "line", "desc": "Describe this change in one line" },
372 [ "grunt chg-add:'{{line}} ([view](https\\://github.com/{{meta.org}}/{{meta.name}}/pull/{{prNum}}))'", "Add a line to the changelog" ],
373 [ "git add CHANGELOG.md", "Add the changlelog change to be committed" ],
374 [ "git commit -a --author='{{prCommits.[0].commit.author.name}} <{{prCommits.[0].commit.author.email}}>' -m '{{line}}. closes #{{prNum}}'", "Commit the changes" ],
375 { "prompt": "confirm", "desc": "Does everything look ok?" },
376 [ "git checkout {{pr.base.ref}}", "Check out the base branch" ],
377 [ "git merge --no-ff {{pr.user.login}}-{{pr.head.ref}}", "Merge the changes" ],
378 [ "git push origin {{pr.base.ref}}", "Push the changes to your remote copy of the project" ],
379 [ "git push upstream {{pr.base.ref}}", "Push the changes to the main project" ],
380 [ "git branch -D {{pr.user.login}}-{{pr.head.ref}}", "Delete the local branch used for merging" ]
381 ]
348 } 382 }
349 } 383 }
350 } 384 }
......