Skip to content

brainfood / videojs-contrib-hls

Go to a project
Toggle navigation
Toggle navigation pinning
db5f4364 by David LaPalomento
Options

Pull and rebase simultaneously and use non-interactive amend 

Simplify the PR rebasing. Make sure the editor isn't invoked to amend the merge commit with the changelog update. Move tests to after the change has been fully merged.
1 parent 230a577a
Inline Side-by-side
Showing 1 changed file with 4 additions and 5 deletions
...@@ -342,16 +342,15 @@ ...@@ -342,16 +342,15 @@
342 { "get": "{{meta.urls.repo_api}}/pulls/{{prNum}}", "desc": "Get the PR information", "id": "pr" }, 342 { "get": "{{meta.urls.repo_api}}/pulls/{{prNum}}", "desc": "Get the PR information", "id": "pr" },
343 { "get": "{{meta.urls.repo_api}}/pulls/{{prNum}}/commits", "desc": "Get the PR commits to access author info", "id": "prCommits" }, 343 { "get": "{{meta.urls.repo_api}}/pulls/{{prNum}}/commits", "desc": "Get the PR commits to access author info", "id": "prCommits" },
344 [ "git checkout -b {{pr.user.login}}-{{pr.head.ref}} {{pr.base.ref}}", "Create a new branch for merging the changes" ], 344 [ "git checkout -b {{pr.user.login}}-{{pr.head.ref}} {{pr.base.ref}}", "Create a new branch for merging the changes" ],
345 [ "git pull {{pr.head.repo.ssh_url}} {{pr.head.ref}}", "Merge in the changes"], 345 [ "git pull --rebase {{pr.head.repo.ssh_url}} {{pr.head.ref}}", "Merge and rebase the changes"],
346 [ "git rebase {{pr.base.ref}}", "Rebase against the latest changes in the base branch"],
347 [ "git checkout {{pr.base.ref}}", "Check out the base branch" ], 346 [ "git checkout {{pr.base.ref}}", "Check out the base branch" ],
348 { "prompt": "confirm", "desc": "Does everything look ok?" },
349 { "prompt": "text", "id": "line", "desc": "Describe this change in one line" }, 347 { "prompt": "text", "id": "line", "desc": "Describe this change in one line" },
350 [ "git merge --no-ff {{pr.user.login}}-{{pr.head.ref}} -m {{line}}. Closes #{{prNum}}", "Merge the changes" ], 348 [ "git merge --no-ff {{pr.user.login}}-{{pr.head.ref}} -m {{line}}. Closes #{{prNum}}", "Merge the changes" ],
351 [ "grunt test", "Run tests to make sure they still pass" ],
352 [ "grunt chg-add:'{{line}} ([view](https\\://github.com/{{meta.org}}/{{meta.name}}/pull/{{prNum}}))'", "Add a line to the changelog" ], 349 [ "grunt chg-add:'{{line}} ([view](https\\://github.com/{{meta.org}}/{{meta.name}}/pull/{{prNum}}))'", "Add a line to the changelog" ],
353 [ "git add CHANGELOG.md", "Add the changlelog change to be committed" ], 350 [ "git add CHANGELOG.md", "Add the changlelog change to be committed" ],
354 [ "git commit --amend", "Add the changelog change to the merge commit" ], 351 [ "git commit --amend --no-edit", "Add the changelog change to the merge commit" ],
352 [ "grunt test", "Run tests to make sure they still pass" ],
353 { "prompt": "confirm", "desc": "Does everything look ok?" },
355 [ "git push origin {{pr.base.ref}}", "Push the changes to your remote copy of the project" ], 354 [ "git push origin {{pr.base.ref}}", "Push the changes to your remote copy of the project" ],
356 [ "git push upstream {{pr.base.ref}}", "Push the changes to the main project" ], 355 [ "git push upstream {{pr.base.ref}}", "Push the changes to the main project" ],
357 [ "git branch -D {{pr.user.login}}-{{pr.head.ref}}", "Delete the local branch used for merging" ] 356 [ "git branch -D {{pr.user.login}}-{{pr.head.ref}}", "Delete the local branch used for merging" ]
......