- Combine merge-pr.sh and merge-external-pr.sh using merge-external-pr.sh as a base
- Modify script interface to ./scripts/merge-pr.sh <PR-ID> and remove options to run with REPO_URL BRANCH arguments
- Works regardless of where PR is hosted and whether or not it is signed by external contributor.
Signed-off-by: Sebastian Delgado <sdalcega@gmail.com>
Signed-off-by: Eric Dvorsak <eric@dvorsak.fr>
Fixes#2971
Because I don't think it is worth a bounty - all the code required was already in the `merge-external-pr.sh` so I have just copied the relevant parts across and added the few necessary lines to ensure that PRs from core contributors cannot be merged unless they have been squashed down to a single commit.
Changed fatal to confirm for merge-pr
Pulls, rebases, displays, signs and pushes external contributions.
If jq(1) and curl(1) are available, can pull data from GitHub and
mark PRs as closed, otherwise only code merging works.
Signed-off-by: Oskar Thoren <ot@oskarthoren.com>
Right after `git clone`, there is no `Statusgo.framework` in `react-native-status/ios/RCTStatus/` directory. Because of that, `scripts/bundle-status-go.sh` fails and stops on the `rm` operation.
Since it is a perfectly valid scenario, let's ignore this error.
Signed-off-by: Oskar Thoren <ot@oskarthoren.com>
Oleh Krehel
alwxndr
Sebastian Delgado
Julien Eluard
Andy Tudhope
Oskar Thoren
Pedro Pombeiro
Roman Volosovskyi
Audrius Molis
Mikhail Gusarov
David Balatero
Igor Mandrigin