Skip to content

Alternate Ubuntu CI fix #50117

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

Merged
merged 6 commits into from
Dec 10, 2022
Merged

Alternate Ubuntu CI fix #50117

merged 6 commits into from
Dec 10, 2022

Conversation

WillAyd
Copy link
Member

@WillAyd WillAyd commented Dec 7, 2022

@MarcoGorelli @lithomas1 @jbrockmendel

I think if we clean up some of this dead code we can support a clean build on newer gcc. Lots of layers of indirection to sift through so not entirely clear on what's happening, but I think gcc isn't going to be happy with some of the paths this theoretically produces

#22234

@@ -17,7 +17,7 @@ permissions:

jobs:
pytest:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
Copy link
Member

Choose a reason for hiding this comment

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

Please don't unpin this. You should change this to ubuntu-22.04 everywhere.

Copy link
Member Author

Choose a reason for hiding this comment

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

20.04 or 22.04? This was just a git revert

Copy link
Member

Choose a reason for hiding this comment

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

We can bump up to 22.04 if CI is green.

Copy link
Member

Choose a reason for hiding this comment

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

xref #50115

@mroeschke mroeschke added the CI Continuous Integration label Dec 8, 2022
@MarcoGorelli MarcoGorelli added this to the 2.0 milestone Dec 10, 2022
Copy link
Member

@MarcoGorelli MarcoGorelli left a comment

Choose a reason for hiding this comment

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

Seems to be working, nice!

@MarcoGorelli MarcoGorelli merged commit 5fe95c6 into pandas-dev:main Dec 10, 2022
@phofl
Copy link
Member

phofl commented Dec 15, 2022

This is also failing on 1.5.x, can we backport or should we pin the ubuntu version?

@MarcoGorelli
Copy link
Member

probably fine to backport?

@MarcoGorelli
Copy link
Member

@meeseeksdev please backport to 1.5.x

@lumberbot-app
Copy link

lumberbot-app bot commented Dec 15, 2022

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 1.5.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 5fe95c60c7b1db349a92e36b23816cfd4f2cc515
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #50117: Alternate Ubuntu CI fix'
  1. Push to a named branch:
git push YOURFORK 1.5.x:auto-backport-of-pr-50117-on-1.5.x
  1. Create a PR against branch 1.5.x, I would have named this PR:

"Backport PR #50117 on branch 1.5.x (Alternate Ubuntu CI fix)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

MarcoGorelli pushed a commit to MarcoGorelli/pandas that referenced this pull request Dec 15, 2022
phofl pushed a commit that referenced this pull request Dec 15, 2022
Backport PR #50117: Alternate Ubuntu CI fix

Co-authored-by: William Ayd <[email protected]>
@WillAyd WillAyd deleted the fix-ci-ubuntu branch April 12, 2023 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI Continuous Integration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants