Commit Graph

61 Commits

Author SHA1 Message Date
Raúl Marín
a30d923672
Update cherry_pick.py 2024-05-02 21:42:49 +02:00
Raúl Marín
713467e812 Fix dev 2024-05-02 17:20:58 +00:00
Raúl Marín
245fac10aa Change must-create-backport-label to support a list
python3 cherry_pick.py --repo ClickHouse/clickhouse-private  --from-repo ClickHouse/ClickHouse --must-create-backport-label pr-must-backport-cloud pr-must-backport --backport-created-label pr-backports-created-cloud
2024-05-02 17:10:56 +00:00
Raúl Marín
7baac14e38 Create cloud backports for all pr-must-backport PRs
Even if pr-must-backport-cloud is not declared
2024-05-02 16:32:04 +00:00
Raúl Marín
e013b99709 Always try to backport to the cloud (v24.3-must-backport) 2024-05-02 16:21:26 +00:00
Mikhail f. Shiryaev
2ba5b7fd23
Refactor labels in CI, move them to shared package 2024-04-24 17:31:14 +02:00
Mikhail f. Shiryaev
e31078e204
Fix some issues detected by new pylint 2024-03-05 16:02:36 +01:00
Mikhail f. Shiryaev
d70c72b89e
Name stash properly 2024-01-18 15:53:02 +01:00
Mikhail f. Shiryaev
15cfc9b0ef
Fix stash and clear_repo contexts
All the cleanup should be done in `finally` block:

```
In [3]: @contextmanager
   ...: def stash():
   ...:     try:
   ...:         print("inside")
   ...:         yield
   ...:     except (Exception, KeyboardInterrupt):
   ...:         print("catched")
   ...:         raise
   ...:     finally:
   ...:         print("always")
   ...:

In [4]: with stash():
   ...:     raise ValueError("something")
   ...:
inside
catched
always
---------------------------------------------------------------------------
ValueError                                Traceback (most recent call last)
Cell In[4], line 2
      1 with stash():
----> 2     raise ValueError("something")

ValueError: something

In [5]: @contextmanager
   ...: def stash():
   ...:     try:
   ...:         print("inside")
   ...:         yield
   ...:     finally:
   ...:         print("always")
   ...:

In [6]: with stash():
   ...:     raise ValueError("something")
   ...:
inside
always
---------------------------------------------------------------------------
ValueError                                Traceback (most recent call last)
Cell In[6], line 2
      1 with stash():
----> 2     raise ValueError("something")
```

And `except` block is unnecessary if it should just re-raise an error
2024-01-18 15:25:59 +01:00
Mikhail f. Shiryaev
deb054dc7e
Add logging for the search PRs to backport query 2023-12-15 13:28:25 +01:00
Mikhail f. Shiryaev
e11fa23032
Add argument to fill the gap in cherry-pick 2023-12-15 12:56:35 +01:00
Mikhail f. Shiryaev
59cf90876c
Changes after a review 2023-11-28 12:19:27 +01:00
Mikhail f. Shiryaev
4aac18d651
Add another header for the wrong conflicts resolution 2023-11-28 12:01:33 +01:00
Mikhail f. Shiryaev
8c4592f5c2
Follow up recommendations from #57167 2023-11-28 11:51:06 +01:00
Mikhail f. Shiryaev
36d27d1713
Improve the cherry-pick PR description 2023-11-23 19:28:58 +01:00
Mikhail f. Shiryaev
ad3f422cff
Get rid of datetime in calculation of since_updated 2023-11-15 10:53:55 +01:00
Mikhail f. Shiryaev
d94228b718
Fix style-check errors 2023-10-04 14:29:00 +02:00
Mikhail f. Shiryaev
c5b1aa4aa5
Clean even more os.path 2023-09-28 01:24:31 +02:00
János Benjamin Antal
84e311321d Add basic logic to find releasable commits 2023-09-13 17:05:31 +00:00
pufit
0d98a46326 Fix KeyError in cherry-pick 2023-06-02 13:02:18 -04:00
pufit
08d3887832
Add re-creation for cherry-pick PRs (#50373)
* Add recreation for cherry-pick PRs.
Small PR comment fix.

* Automatic style fix

---------

Co-authored-by: robot-clickhouse <robot-clickhouse@users.noreply.github.com>
Co-authored-by: Nikita Mikhaylov <mikhaylovnikitka@gmail.com>
2023-05-31 13:04:29 +02:00
pufit
4ce722854b Fix URL in backport comment 2023-05-25 11:51:47 -04:00
pufit
8875b98e2a Added default value for --from-repo arg 2023-05-24 13:47:50 -04:00
pufit
8df7a69147
Automatic backports of important fixes to cloud-release
* Automatic backports to cloud-release

---------

Co-authored-by: robot-clickhouse <robot-clickhouse@users.noreply.github.com>
2023-05-24 18:59:18 +02:00
Mikhail f. Shiryaev
d88f71f2b9
Comment stale cherry-pick PRs to resolve conflicts 2023-03-21 18:28:29 +01:00
Mikhail f. Shiryaev
a3096a4583
Clarify steps for reopened cherry-pick PRs 2023-03-20 12:36:35 +01:00
Mikhail f. Shiryaev
135961acb7
Change the cherry-pick PR body 2023-02-27 17:59:19 +01:00
Mikhail f. Shiryaev
33a2e2b3d8
Set default per_page=100 for GitHub 2023-02-23 10:38:09 +01:00
Mikhail f. Shiryaev
4361c666e6
Always update local release branches 2023-02-04 01:07:20 +01:00
Mikhail f. Shiryaev
0e10593037
Do not count changed submodules as needed to stash 2023-02-03 23:17:06 +01:00
Mikhail f. Shiryaev
a4c2ac7e97
Commit only staged files to backport branches
Formerly all changed files were committed, and it caused changed
submodules to be committed as well
2023-02-02 18:18:37 +01:00
Mikhail f. Shiryaev
46ff77654c
Update cherrypick_pr to get mergeable state 2023-02-02 16:13:50 +01:00
Mikhail f. Shiryaev
d4f60bc9da
Fix the case when merge-base does not show the oldest commit 2023-01-20 13:55:21 +01:00
Mikhail f. Shiryaev
fe44b514b7
Create GitHub cache directory optionally by default 2022-12-09 21:33:06 +01:00
Mikhail f. Shiryaev
8897aa7fe8
Merge pull request #43132 from ClickHouse/strict-typing-ci
Enable strict typing check in tests/ci
2022-12-01 14:37:25 +01:00
Mikhail f. Shiryaev
5d7cb6b85a
Change email for robot-clickhouse to immutable one 2022-12-01 13:01:35 +01:00
Mikhail f. Shiryaev
ba9e51d686
Fix cherry-pick.py typing issues 2022-11-29 14:12:22 +01:00
Mikhail f. Shiryaev
6a17d4e705
Delete redundant LABEL_ prefix 2022-09-16 10:23:49 +02:00
Mikhail f. Shiryaev
ab7bd95d8b
Rename pr-backported label to avoid confusion 2022-09-16 10:04:49 +02:00
Mikhail f. Shiryaev
ca837e6755
Add a doc-string for ReleaseBranch._assign_new_pr 2022-09-01 13:06:14 +02:00
Mikhail f. Shiryaev
1da02adc8d
Assign PRs to an original merged_by too 2022-09-01 12:38:30 +02:00
Mikhail f. Shiryaev
187b10dec5
Assign to all at once, improve logging 2022-08-31 14:09:17 +02:00
Mikhail f. Shiryaev
e513ad6748
And the last tiny fix for assignees 2022-08-18 23:32:55 +02:00
Mikhail f. Shiryaev
dce060bac4
Fix wrong assignees argument passing 2022-08-18 22:22:50 +02:00
Mikhail f. Shiryaev
7f61f30f15
Improve assignment and logging for cherry-pick and backport steps 2022-08-12 23:30:32 +02:00
Mikhail f. Shiryaev
6126bd60ed
Fix cherry-pick for cases, when assignee is not set for PR 2022-07-29 19:27:38 +02:00
Mikhail f. Shiryaev
6e48b08190
Clean-up some staff left after finishing 2022-07-15 17:58:45 +02:00
Mikhail f. Shiryaev
dc6db5b5d9
Replace sys.exit by Exception to rollback stash and clear_repo 2022-07-15 17:21:19 +02:00
Mikhail f. Shiryaev
48797660ff
Process exceptions per PR to not fail the script 2022-07-15 17:21:18 +02:00
Mikhail f. Shiryaev
30b0995532
Add early check if PR is already in a release branch 2022-07-15 17:21:18 +02:00