20 Commits

Author SHA1 Message Date
Igor Minar
9dabeea807 ci: add a rebase check to the merge-pr script ()
Adds a check to verify that each PR branch to be merged upstream contains SHAs of commits that significantly changed our CI infrastructure.

This check is used to enforce that we don't merge PRs that have not been rebased recently and could result in merging of non-approved or otherwise bad changes.

PR Close 
2019-01-22 09:26:53 -08:00
Miško Hevery
0f7d2ca7a8 build: add more labels to review-pr script ()
PR Close 
2018-10-16 14:36:28 -07:00
Miško Hevery
989555352d build: add --force to push-pr 2018-10-11 16:13:59 -07:00
Igor Minar
f94f9640d0 ci: correctly encode quoted params passed as params to curl
Previously the auth token could have been split into three separate args in bash which resulted
in two bogus requests being sent out for each curl call. These requests had to time out before
the real request was made, but without the token.

I couldn't find a better way to quickly fix this without adding some duplication.
2018-07-30 16:46:11 -07:00
Misko Hevery
f841e36543 ci: scripts to review PRs locally ()
PR Close 
2018-06-25 08:45:12 -07:00
Victor Berchet
855d9c00e0 build: replace hard-coded master branch with the variable ()
PR Close 
2018-05-30 11:31:39 -07:00
Victor Berchet
3a809cb431 build: add support for the "merge-assistance" label in merge-pr ()
fixes 

PR Close 
2018-02-23 12:58:30 -08:00
Victor Berchet
f791862e52 build: add release helper scripts ()
PR Close 
2018-02-22 16:12:50 -08:00
Victor Berchet
7fa2d4b503 fix: merge-pr script ()
PR Close 
2018-02-18 13:13:29 -08:00
Victor Berchet
f4845fae12 build: use authenticated mode for the merge script ()
`TOKEN` is the name with use for other GH scripts

PR Close 
2018-02-18 12:44:42 -08:00
Matias Niemelä
03d93c96a3 Revert: "build: merge-pr new checks that all requested changes have been addressed ()"
This reverts commit 4a4d74971079482244520620008fe81cb3e97b55.
2018-02-15 11:00:52 -08:00
Matias Niemelä
47f51c2ead Revert "Revert "build: merge-pr new checks that all requested changes have been addressed ()""
This reverts commit 5b8eb9c5c78e7724c84bf359bdff7ad96858dad1.
2018-02-14 22:55:56 -05:00
Matias Niemelä
5b8eb9c5c7 Revert "build: merge-pr new checks that all requested changes have been addressed ()"
This reverts commit 4a4d74971079482244520620008fe81cb3e97b55.
2018-02-14 18:48:45 -05:00
Miško Hevery
4a4d749710 build: merge-pr new checks that all requested changes have been addressed ()
PR Close 
2018-02-09 17:14:17 -08:00
Miško Hevery
e0b31dbfef build: merge-pr now checks that PR status is green before proceeding ()
Optionally one can use `--force` to override and merge no non-green PR.

PR Close 
2018-01-26 14:50:41 -08:00
Miško Hevery
5713faa667 build: autosquashes SHAs as part of merge-pr script ()
To support `git checkin --fixup` and `git checkin —squash`
we need to make sure that `merge-pr` squashes the sepecial
commits before they are merged.

For more details see:
https://robots.thoughtbot.com/autosquashing-git-commits

PR Close 
2018-01-25 22:12:11 -08:00
Miško Hevery
c7c5214029 build: merge PR to all branches per target: label ()
PR Close 
2018-01-24 12:35:11 -08:00
Misko Hevery
e726d81822 build: force fetch PR in merge script ()
Use `-f` when doing `git fetch` for the PR. Without 
it the `git fetch` will not overwrite what is currently 
fetched locally, in essence doing fast-forward only.
PR Close 
2018-01-05 15:01:55 -05:00
Miško Hevery
bc7a6d7b00 build: force upstream fetch before merge ()
PR Close 
2017-12-27 17:42:03 -06:00
Miško Hevery
d1764fc3dd build: Add GitHub scripts for rebasing PRs ()
PR Close 
2017-08-28 18:44:39 -05:00