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

Fixing CI from #711 #729

Merged
merged 6 commits into from
Nov 28, 2024
Merged

Fixing CI from #711 #729

merged 6 commits into from
Nov 28, 2024

Conversation

penelopeysm
Copy link
Member

@penelopeysm penelopeysm commented Nov 28, 2024

#711

To be clear I introduced some of these errors when performing a manual merge, it's just that GitHub decided to merge the PR before I could see the outcome of CI

penelopeysm and others added 3 commits November 28, 2024 14:49
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@torfjelde
Copy link
Member

Oh sorry, I shouldn't have done that @penelopeysm ; thought i was looking at another PR 🤦

@penelopeysm
Copy link
Member Author

haha don't worry 😄

torfjelde and others added 3 commits November 28, 2024 19:07
@torfjelde
Copy link
Member

Think I fixed the issues now @penelopeysm :)

@torfjelde torfjelde marked this pull request as ready for review November 28, 2024 18:11
@penelopeysm
Copy link
Member Author

Thanks for picking it up!

@penelopeysm penelopeysm added this pull request to the merge queue Nov 28, 2024
Merged via the queue into master with commit 2344689 Nov 28, 2024
3 of 11 checks passed
@penelopeysm penelopeysm deleted the py/ci-fixes branch November 28, 2024 18:28
@penelopeysm
Copy link
Member Author

Ohhhhh, I think I know what happened with the merge queue. I had to temporarily remove the required CI checks, because of #724 (otherwise it would wait forever on the macos x64 job that wasn't being run any more), and they haven't been added back yet, so it just merges right away without checking anything.

I'll fix that in the repo settings and then I think we should be back to normal.

@penelopeysm penelopeysm mentioned this pull request Nov 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants