87a2366eeb
build: update base SHA for rebase on merge-pr script
2019-05-21 17:07:19 -07:00
a181e8e7d8
refactor: improve merge script formatting ( #29991 )
...
PR Close #29991
2019-04-19 14:33:30 -07:00
9dabeea807
ci: add a rebase check to the merge-pr script ( #28250 )
...
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 #28250
2019-01-22 09:26:53 -08:00
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
855d9c00e0
build: replace hard-coded master branch with the variable ( #24199 )
...
PR Close #24199
2018-05-30 11:31:39 -07:00
3a809cb431
build: add support for the "merge-assistance" label in merge-pr ( #22414 )
...
fixes #22256
PR Close #22414
2018-02-23 12:58:30 -08:00
f791862e52
build: add release helper scripts ( #22378 )
...
PR Close #22378
2018-02-22 16:12:50 -08:00
7fa2d4b503
fix: merge-pr script ( #22290 )
...
PR Close #22290
2018-02-18 13:13:29 -08:00
f4845fae12
build: use authenticated mode for the merge script ( #22269 )
...
`TOKEN` is the name with use for other GH scripts
PR Close #22269
2018-02-18 12:44:42 -08:00
03d93c96a3
Revert: "build: merge-pr new checks that all requested changes have been addressed ( #21817 )"
...
This reverts commit 4a4d749710
2018-02-15 11:00:52 -08:00
47f51c2ead
Revert "Revert "build: merge-pr new checks that all requested changes have been addressed ( #21817 )""
...
This reverts commit 5b8eb9c5c7
2018-02-14 22:55:56 -05:00
5b8eb9c5c7
Revert "build: merge-pr new checks that all requested changes have been addressed ( #21817 )"
...
This reverts commit 4a4d749710
2018-02-14 18:48:45 -05:00
4a4d749710
build: merge-pr new checks that all requested changes have been addressed ( #21817 )
...
PR Close #21817
2018-02-09 17:14:17 -08:00
e0b31dbfef
build: merge-pr now checks that PR status is green before proceeding ( #21810 )
...
Optionally one can use `--force` to override and merge no non-green PR.
PR Close #21810
2018-01-26 14:50:41 -08:00
5713faa667
build: autosquashes SHAs as part of merge-pr script ( #21791 )
...
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 #21791
2018-01-25 22:12:11 -08:00
c7c5214029
build: merge PR to all branches per target: label ( #21739 )
...
PR Close #21739
2018-01-24 12:35:11 -08:00
e726d81822
build: force fetch PR in merge script ( #21295 )
...
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 #21295
2018-01-05 15:01:55 -05:00
bc7a6d7b00
build: force upstream fetch before merge ( #21192 )
...
PR Close #21192
2017-12-27 17:42:03 -06:00
d1764fc3dd
build: Add GitHub scripts for rebasing PRs ( #18359 )
...
PR Close #18359
2017-08-28 18:44:39 -05:00
Jason Aden
Ben Lesh
Igor Minar
Victor Berchet
Matias Niemelä
Miško Hevery