Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Dev] Merge PR script defaults to the wrong milestone when merging #36634

Closed
raulcd opened this issue Jul 12, 2023 · 3 comments · Fixed by #36637
Closed

[Dev] Merge PR script defaults to the wrong milestone when merging #36634

raulcd opened this issue Jul 12, 2023 · 3 comments · Fixed by #36637

Comments

@raulcd
Copy link
Member

raulcd commented Jul 12, 2023

Describe the bug, including details regarding any error messages, version, and platform.

I saw that lots of PRs were merged with the wrong milestone (13.0.0) now that the maintenance branch has been created it should default to 14.0.0 but it is not as seen:

Would you like to update the associated issue? (y/n): y
Enter fix version [13.0.0]:

It does seem that the 12.0.0 and 12.0.1 maintenance branches are also not shown:

(Pdb) pr.maintenance_branches
['maint-0.11.x', 'maint-0.12.x', 'maint-0.14.x', 'maint-0.15.x', 'maint-0.17.x', 'maint-1.0.x', 'maint-3.0.x', 'maint-4.0.x', 'maint-6.0.x', 'maint-7.0.x', 'maint-7.0.1', 'maint-8.0.x', 'maint-9.0.0', 'maint-10.0.x', 'maint-10.0.0', 'maint-10.0.1', 'maint-11.0.0']
(Pdb) 

It might be due to pagination when requesting branches:

    def get_branches(self):
        return get_json("%s/branches" % (self.github_api),
                        headers=self.headers)

Component(s)

Developer Tools

@raulcd
Copy link
Member Author

raulcd commented Jul 12, 2023

@kou there are some branches which I am unsure should be on the repo, like old RC branches or some feature branches like:
decimal256
new-contrib-language
flight-sql-jdbc
ibis-remove-string-contains
dom/aray

I think all those can be removed, for the old RC ones we have the release and the maintenance branch. Are you ok with me removing those?

edit: typo

@kou
Copy link
Member

kou commented Jul 13, 2023

Yes. Could you remove them?

decimal256

This was merged by #8475

This was merged by #13217 and I removed it now.

flight-sql-jdbc

This was merged by #13800.

ibis-remove-string-contains

This is garbage.

dom/aray

This was merged by #35772 and I removed it now.

@raulcd
Copy link
Member Author

raulcd commented Jul 13, 2023

Thanks @kou , I've removed:
decimal256
flight-sql-jdbc
ibis-remove-string-contains
and all the release candidate branches for old releases.

kou added a commit that referenced this issue Jul 14, 2023
…ng info from GitHub (#36637)

### Rationale for this change

We currently were missing maintenance branches due to pagination on GH API.

### What changes are included in this PR?

Check whether the API is returning a paginated view and extend the list returned.

### Are these changes tested?

I have tested locally:

```
(Pdb) pr.maintenance_branches
['maint-0.11.x', 'maint-0.12.x', 'maint-0.14.x', 'maint-0.15.x', 'maint-0.17.x', 'maint-1.0.x', 'maint-3.0.x', 'maint-4.0.x', 'maint-6.0.x', 'maint-7.0.x', 'maint-7.0.1', 'maint-8.0.x', 'maint-9.0.0', 'maint-10.0.x', 'maint-10.0.0', 'maint-10.0.1', 'maint-11.0.0', 'maint-12.0.x', 'maint-12.0.0', 'maint-12.0.1', 'maint-13.0.0']
(Pdb) c
Enter fix version [14.0.0]: 
```
### Are there any user-facing changes?

No
* Closes: #36634

Lead-authored-by: Raúl Cumplido <raulcumplido@gmail.com>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Signed-off-by: Sutou Kouhei <kou@clear-code.com>
@kou kou added this to the 14.0.0 milestone Jul 14, 2023
chelseajonesr pushed a commit to chelseajonesr/arrow that referenced this issue Jul 20, 2023
…questing info from GitHub (apache#36637)

### Rationale for this change

We currently were missing maintenance branches due to pagination on GH API.

### What changes are included in this PR?

Check whether the API is returning a paginated view and extend the list returned.

### Are these changes tested?

I have tested locally:

```
(Pdb) pr.maintenance_branches
['maint-0.11.x', 'maint-0.12.x', 'maint-0.14.x', 'maint-0.15.x', 'maint-0.17.x', 'maint-1.0.x', 'maint-3.0.x', 'maint-4.0.x', 'maint-6.0.x', 'maint-7.0.x', 'maint-7.0.1', 'maint-8.0.x', 'maint-9.0.0', 'maint-10.0.x', 'maint-10.0.0', 'maint-10.0.1', 'maint-11.0.0', 'maint-12.0.x', 'maint-12.0.0', 'maint-12.0.1', 'maint-13.0.0']
(Pdb) c
Enter fix version [14.0.0]: 
```
### Are there any user-facing changes?

No
* Closes: apache#36634

Lead-authored-by: Raúl Cumplido <raulcumplido@gmail.com>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Signed-off-by: Sutou Kouhei <kou@clear-code.com>
R-JunmingChen pushed a commit to R-JunmingChen/arrow that referenced this issue Aug 20, 2023
…questing info from GitHub (apache#36637)

### Rationale for this change

We currently were missing maintenance branches due to pagination on GH API.

### What changes are included in this PR?

Check whether the API is returning a paginated view and extend the list returned.

### Are these changes tested?

I have tested locally:

```
(Pdb) pr.maintenance_branches
['maint-0.11.x', 'maint-0.12.x', 'maint-0.14.x', 'maint-0.15.x', 'maint-0.17.x', 'maint-1.0.x', 'maint-3.0.x', 'maint-4.0.x', 'maint-6.0.x', 'maint-7.0.x', 'maint-7.0.1', 'maint-8.0.x', 'maint-9.0.0', 'maint-10.0.x', 'maint-10.0.0', 'maint-10.0.1', 'maint-11.0.0', 'maint-12.0.x', 'maint-12.0.0', 'maint-12.0.1', 'maint-13.0.0']
(Pdb) c
Enter fix version [14.0.0]: 
```
### Are there any user-facing changes?

No
* Closes: apache#36634

Lead-authored-by: Raúl Cumplido <raulcumplido@gmail.com>
Co-authored-by: Sutou Kouhei <kou@cozmixng.org>
Signed-off-by: Sutou Kouhei <kou@clear-code.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants