1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Commit Graph

21 Commits

Author SHA1 Message Date
Marian Buschsieweke
9bba2d074c
tools/backport_pr: finally fix running outside of repo's root
It turned out that 4983f8bb60 was not
enough to allow the tool to be executed from within
`dist/tools/backport_pr`. With this, I successfully tested it :)
2022-11-11 19:52:18 +01:00
Marian Buschsieweke
4983f8bb60
tools/backport_pr.py: improve usability
Add `search_parent_directories=True` to `git.Repo()` so that
`backport_pr.py` can be called anywhere within the RIOT git repo
without manually passing the repo root path via `--gitdir`.

Previously the tool had to be called from the RIOT base repo.
2022-11-10 09:52:24 +01:00
8d4d8f207d
tools/backport_pr: reformat with black 2021-10-22 10:20:52 +02:00
43a7c8c8f2
tools/backport_pr: add black testenv in tox
Add Flake8 and Pylint configuration compatible with black
2021-10-22 10:20:52 +02:00
Martine Lenders
9254cffdda
dist/tools/backport_pr: use f-strings where possible 2021-09-17 12:04:04 +02:00
dfa9979615
tools/backport_pr: add doctest for _get_latest_release function 2020-07-04 18:25:36 +02:00
4b6ab1e583
tools/backport_pr: fix warning/issues reported by pylint and flake8 2020-07-04 18:25:36 +02:00
09c7b54704
tools/backport_pr: relax pylint and flake8 checks
- ignore fixme warning with pylint
- increase tolerated code complexity for flake8
2020-07-04 18:25:36 +02:00
Karl Fessel
563f4f6d9d tools/backport_pr: Add Token Scope check 2020-03-04 14:30:12 +01:00
09e8e1f612 dist/tools/backport_pr: fix typos 2019-11-23 22:39:37 +01:00
Martine Lenders
11da5e8e67
Merge pull request #11435 from miri64/dist/fix/backport-tracking
backport_pr: set tracking branch to remotely created branch
2019-04-24 16:37:08 +02:00
Martine Lenders
aef6110b40 backport_pr: set tracking branch to remotely created branch 2019-04-24 15:53:54 +02:00
Martine Lenders
22640396a5 backport_pr: get Head object from new_branch name after creation 2019-04-24 15:52:55 +02:00
Martine Lenders
e3a99c40f6 backport_pr: exclude 'Reviewed' labels from backport 2019-04-24 11:52:54 +02:00
Martine Lenders
292c5dd730 backport_pr: add doc tests for _get_labels() 2019-04-24 11:47:22 +02:00
Martine Lenders
1930368fd5 backport_pr: exit early when backport branch already exists 2019-04-17 12:44:21 +02:00
Martine Lenders
a7459e7463 backport_pr: don't assume devel remote to be 'origin' 2019-04-17 12:42:02 +02:00
Martine Lenders
989e2c6303 backport_pr: add function to find remote by URL 2019-04-17 12:35:14 +02:00
Martine Lenders
a9767889fc backport_pr: make error branch handling more idempotent
Otherwise, when an error occurs (e.g. credentials wrong on git push)
the worktree and the release branch still exists, which might be hard to
remove for a newcomer not knowing about `git worktree`.
2019-04-17 12:11:53 +02:00
Gaëtan Harter
9af491d2f6
tools/backport_pr: add tox.ini
Adapt tox file from `compile_and_test_for_board.py`.

`tox` is still not working without errors but gives way to start
refactoring.
2019-02-12 15:34:15 +01:00
493cac27f3
dist/tools: Add script for backporting PR's
This script provides functionality to easily backport a merged pull request to
a release branch.

It relies of having a `github` API token stored in `~/.riotgithubtoken` by
default.

The script works by fetching information from the supplied **merged** pull
request. It then looks for the last release branch.
A temporary git `worktree` with a new branch is created based on this release
branch. All commits from the pull request are then cherry-picked into this
branch which is then pushed to `origin`.
It then creates a new pull request on `github` with a reference to the original
pull request. It optionally puts a comment under the original pull request to
the new backport pull request.

Co-authored-by: Gaëtan Harter <gaetan.harter@fu-berlin.de>
2019-02-12 15:34:12 +01:00