Commit Graph

9 Commits

Author SHA1 Message Date
Pedro Pombeiro 3af25381e1
Change shebang in bash scripts 2019-03-21 13:57:00 +01:00
Pedro Pombeiro 486d4684b8
Improve log format in StatusIm and add timestamps
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
2018-09-18 12:10:39 +02:00
Jourdan Luca 9bf16fa5c4
issue #4681
Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>
2018-07-16 11:38:41 +02:00
Sebastian Delgado 92c83f6579
Add conditions to check for core-contributors in merge PR script
Signed-off-by: Dmitry Novotochinov <trybeee@gmail.com>
2018-02-01 19:20:23 +03:00
Sebastian Delgado bf95603b56
[FIX #3074] Combine PR scripts and clean up usage of merge-external-pr.sh
- 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>
2018-01-23 22:12:18 +01:00
Andy Tudhope 5f979cdf8c
merge-pr script should prompt for multiple commits
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
2018-01-16 18:01:53 +01:00
Oskar Thoren 0ad29ed164
Fix merge-pr script so it runs as bash
As opposed to wannabe POSIX with bashisms. Makes it run reliably on most user
systems (Mac/Linux)
2017-12-15 11:01:39 +01:00
Julien Eluard 518f68f08f Added build scripts 2017-12-12 09:05:18 +01:00
Oskar Thoren a68f065237
Add merge-pr.sh script 2017-12-06 16:34:02 +01:00