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

.github/workflows/build.yml, doc-build.yml: Fix get_ci_fixes #36348

Merged
merged 1 commit into from
Oct 8, 2023

Conversation

mkoeppe
Copy link
Member

@mkoeppe mkoeppe commented Sep 27, 2023

... for the case when there are no blocker PRs to be applied

📝 Checklist

  • The title is concise, informative, and self-explanatory.
  • The description explains in detail what this PR is about.
  • I have linked a relevant issue or discussion.
  • I have created tests covering the changes.
  • I have updated the documentation accordingly.

⌛ Dependencies

@mkoeppe
Copy link
Member Author

mkoeppe commented Sep 28, 2023

@tobiasdiez Seems you didn't see #36338 (comment)

@mkoeppe
Copy link
Member Author

mkoeppe commented Sep 28, 2023

@tobiasdiez Kindly refrain from pushing untested changes to automatically applied blocker PRs.

https://github.com/sagemath/sage/wiki/Sage-10.2-Release-Tour#open-blocker-prs-are-applied-automatically-in-ci-workflows

@tobiasdiez
Copy link
Contributor

@tobiasdiez Kindly refrain from pushing untested changes to automatically applied blocker PRs.

https://github.com/sagemath/sage/wiki/Sage-10.2-Release-Tour#open-blocker-prs-are-applied-automatically-in-ci-workflows

Changes to CI workflows are not applied anyway...but yeah, another disadvantage of using the single blocker label. Good that you see this yourself.

@tobiasdiez
Copy link
Contributor

tobiasdiez commented Sep 28, 2023

Let's try to find a proper fix in #36349, that also resolves a few other issues with the auto-apply of PRs.

We can leave this one open, to test if merging of other PRs works or not.

@mkoeppe
Copy link
Member Author

mkoeppe commented Sep 28, 2023

This is a proper fix.

@mkoeppe
Copy link
Member Author

mkoeppe commented Sep 29, 2023

Thanks, Dima!

Copy link
Contributor

@tobiasdiez tobiasdiez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, but I'm not happy with this. Please properly fix the issues mentioned in #36349. There is no need to hurry to get another hotfix in. Also, please test changes to these workflows when there are other blockers and when there are not.

@mkoeppe
Copy link
Member Author

mkoeppe commented Sep 29, 2023

The PR fixes what it promises to fix.

@tobiasdiez
Copy link
Contributor

Can you please not set it to positive review when there is a negative review. Thanks!

@mkoeppe
Copy link
Member Author

mkoeppe commented Sep 29, 2023

Tobias, the change here has been tested and has been reviewed by an expert. I don't believe that you have actual concerns that my fix here fixes the described problem.

As you refer to #36349, this PR fixes the first bullet point.
The 2nd is an unfinished design discussion on a minor detail.
The 3rd is just cosmetics.

@mkoeppe
Copy link
Member Author

mkoeppe commented Sep 30, 2023

Once again let me point you to https://github.com/sagemath/sage/blob/develop/CODE_OF_CONDUCT.md

@tobiasdiez
Copy link
Contributor

We have two PRs both fixing the same issue by (slightly) different means. It's only natural to decide first which of these approaches is the better one, before merging either of these PRs.

For example, if I were to propose a new PR that would simply disable the "get ci fixes" functionality for now, you would probably dismiss this PR as well - although it would fix the bug as well.

@kwankyu
Copy link
Collaborator

kwankyu commented Oct 1, 2023

We have two PRs both fixing the same issue by (slightly) different means.

Really? This PR (M) fixes the issue (no blocker PRs), and does only that. Your PR (T) takes back steps, removing the issue, and does more things. If we take (T), we discard (M). But if we take (M), we may still consider (T) and can take (T) or updated (T) (as it does a few things currently). Taking (M) does not mean discarding (T).

If you block this PR (M), then you are forcing us to take your PR (T). This is not a valid reason to block a PR. This is not a proper way to promote your PR.

vbraun pushed a commit to vbraun/sage that referenced this pull request Oct 1, 2023
    
<!-- Please provide a concise, informative and self-explanatory title.
-->
<!-- Don't put issue numbers in the title. Put it in the Description
below. -->
<!-- For example, instead of "Fixes sagemath#12345", use "Add a new method to
multiply two integers" -->

### 📚 Description

Follow-up on sagemath#35169.

The container `sage-docker-fedora-31-maximal-with-targets` used for the
PDF docbuild turned out to be not reliable.
Here we replace it by `ubuntu-focal-standard-with-targets` and install
texlive in it.

We also copy over the incremental build from doc-build.yml and the
method to get CI fixes from blocker tickets from sagemath#36338.

This workflow is currently disabled in sagemath/sage.
Example run:
https://github.com/mkoeppe/sage/actions/runs/6318741659/job/17158468016

<!-- Describe your changes here in detail. -->
<!-- Why is this change required? What problem does it solve? -->
<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes sagemath#12345". -->
<!-- If your change requires a documentation PR, please link it
appropriately. -->

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. It should be `[x]` not `[x
]`. -->

- [x] The title is concise, informative, and self-explanatory.
- [ ] The description explains in detail what this PR is about.
- [x] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on
- sagemath#12345: short description why this is a dependency
- sagemath#34567: ...
-->
- Depends on sagemath#36338
- Depends on sagemath#36348

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: sagemath#35373
Reported by: Matthias Köppe
Reviewer(s): Dima Pasechnik
vbraun pushed a commit to vbraun/sage that referenced this pull request Oct 1, 2023
…_ci_fixes

    
... for the case when there are no blocker PRs to be applied

<!-- ^^^^^
Please provide a concise, informative and self-explanatory title.
Don't put issue numbers in there, do this in the PR body below.
For example, instead of "Fixes sagemath#1234" use "Introduce new method to
calculate 1+1"
-->
<!-- Describe your changes here in detail -->

<!-- Why is this change required? What problem does it solve? -->
<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes sagemath#12345". -->
<!-- If your change requires a documentation PR, please link it
appropriately. -->

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. -->
<!-- If your change requires a documentation PR, please link it
appropriately -->
<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
<!-- Feel free to remove irrelevant items. -->

- [x] The title is concise, informative, and self-explanatory.
- [ ] The description explains in detail what this PR is about.
- [ ] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on
- sagemath#12345: short description why this is a dependency
- sagemath#34567: ...
-->

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: sagemath#36348
Reported by: Matthias Köppe
Reviewer(s): Dima Pasechnik, Kwankyu Lee, Matthias Köppe, Tobias Diez
@tobiasdiez
Copy link
Contributor

@kwankyu I'm deleting the code that Matthias is changing. So no, we cannot have both fixes at the same time in the codebase.

Please, please refrain from putting the positive review label on if there are clearly changes requested. Didn't we learn from the whole Python drop debacle that label wars are not a nice thing (for both sides)? It's probably to late now but @vbraun please remove this commit again from your merge branch.

Let's hope this is actually working, since I couldn't find a test run without any blocker tickets...which, in my opinion, should have been for a prerequisite for a review.

@mkoeppe
Copy link
Member Author

mkoeppe commented Oct 2, 2023

Tobias, you are abusing your privileges as a member of the Triage role with these obstructive actions.

I'll refer this to sage-abuse (again).

@mkoeppe
Copy link
Member Author

mkoeppe commented Oct 2, 2023

Let's hope this is actually working, since I couldn't find a test run without any blocker tickets...which, in my opinion, should have been for a prerequisite for a review.

Once again, Tobias, I don't believe you that you actually have these concerns.

@tobiasdiez
Copy link
Contributor

Let's hope this is actually working, since I couldn't find a test run without any blocker tickets...which, in my opinion, should have been for a prerequisite for a review.

Once again, Tobias, I don't believe you that you actually have these concerns.

Well, last time I remarked that this auto-fix feature was not well tested (in my opinion), it broke many CI workflows. So, yes, you can believe me that I have the concern that an (what appears to me as an) untested change to the CI infrastructure breaks things again.

Did you actually run the workflow without any (other) PRs marked as blocker or not?

@mkoeppe
Copy link
Member Author

mkoeppe commented Oct 2, 2023

Please, please refrain from putting the positive review label on if there are clearly changes requested. Didn't we learn from the whole Python drop debacle that label wars are not a nice thing (for both sides)? It's probably to late now but @vbraun please remove this commit again from your merge branch.

I also have to call out this inappropriate attempt to intimidate other reviewers, and this new attempt to gaslight others regarding our project's procedures and standards.

No, the members of our project did not need the learning experience from your abusive conduct in #35404 (and related tickets). The standard in our community is to use technical and civilized discussions made in good faith.

Tobias, it's not too late to change how you act in our community, and I hope that you can make this necessary change.

@vbraun vbraun merged commit a401721 into sagemath:develop Oct 8, 2023
47 of 66 checks passed
vbraun pushed a commit that referenced this pull request Oct 8, 2023
    
<!-- Please provide a concise, informative and self-explanatory title.
-->
<!-- Don't put issue numbers in the title. Put it in the Description
below. -->
<!-- For example, instead of "Fixes #12345", use "Add a new method to
multiply two integers" -->

### 📚 Description

Follow-up on #35169.

The container `sage-docker-fedora-31-maximal-with-targets` used for the
PDF docbuild turned out to be not reliable.
Here we replace it by `ubuntu-focal-standard-with-targets` and install
texlive in it.

We also copy over the incremental build from doc-build.yml and the
method to get CI fixes from blocker tickets from #36338.

This workflow is currently disabled in sagemath/sage.
Example run:
https://github.com/mkoeppe/sage/actions/runs/6318741659/job/17158468016

<!-- Describe your changes here in detail. -->
<!-- Why is this change required? What problem does it solve? -->
<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes #12345". -->
<!-- If your change requires a documentation PR, please link it
appropriately. -->

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. It should be `[x]` not `[x
]`. -->

- [x] The title is concise, informative, and self-explanatory.
- [ ] The description explains in detail what this PR is about.
- [x] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on
- #12345: short description why this is a dependency
- #34567: ...
-->
- Depends on #36338
- Depends on #36348

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: #35373
Reported by: Matthias Köppe
Reviewer(s): Dima Pasechnik
@mkoeppe mkoeppe added this to the sage-10.2 milestone Oct 8, 2023
@mkoeppe mkoeppe deleted the fix_get_ci_fixes branch October 10, 2023 16:41
@mkoeppe mkoeppe added the disputed PR is waiting for community vote, see https://groups.google.com/g/sage-devel/c/IgBYUJl33SQ label Dec 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
disputed PR is waiting for community vote, see https://groups.google.com/g/sage-devel/c/IgBYUJl33SQ p: blocker / 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants