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

Fix Cygwin CI after #32841 #35052

Merged
merged 2 commits into from
Feb 15, 2023
Merged

Fix Cygwin CI after #32841 #35052

merged 2 commits into from
Feb 15, 2023

Conversation

mkoeppe
Copy link
Contributor

@mkoeppe mkoeppe commented Feb 9, 2023

📚 Description

Cygwin workflows were mangled by a bad merge, leading to syntax errors even whenever the workflow is parsed.

Here we fix this; note that the Cygwin workflow is still not functional afterward (the first step, installation of Cygwin with choco, fails). But this will only affect builds of releases and does not happen for PR CI runs.

Closes #35048

📝 Checklist

  • I have made sure that the title is self-explanatory and the description concisely explains the PR.
  • I have linked an issue or discussion.
  • I have created tests covering the changes.
  • I have updated the documentation accordingly.

⌛ Dependencies

@roed314
Copy link
Contributor

roed314 commented Feb 9, 2023

This is certainly an improvement (since the workflow starts now), but it still seems to be failing: https://github.com/sagemath/sage/actions/runs/4137773690.

@roed314
Copy link
Contributor

roed314 commented Feb 9, 2023

You should probably also merge develop.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 9, 2023

This is certainly an improvement (since the workflow starts now), but it still seems to be failing

Yes, as noted in the PR description.
Fixing the workflow won't be very useful at the moment – I don't plan to work on the Cygwin port any more, and no one else has stepped up. See https://github.com/sagemath/sage/wiki/ReleaseTours-sage-9.7#sources

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 9, 2023

You should probably also merge develop.

No need; nothing else touches these files.

@roed314
Copy link
Contributor

roed314 commented Feb 9, 2023

Ok.

Copy link
Contributor

@roed314 roed314 left a comment

Choose a reason for hiding this comment

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

Works for me: I'm no longer getting syntax errors on the workflow.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 9, 2023

Thanks, David!

@dimpase
Copy link
Member

dimpase commented Feb 15, 2023

Can we have a careful rebase here? I don't want to accidentally destroy fix-develop.

@dimpase
Copy link
Member

dimpase commented Feb 15, 2023

We can also merge directly into develop... But pick one way.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 15, 2023

What is fix-develop?

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Feb 15, 2023

Oh I see, I created the branch in sagemath/sage by accident. Will delete as soon as this PR is merged.

@dimpase dimpase merged commit 525c625 into develop Feb 15, 2023
@mkoeppe mkoeppe deleted the fix-develop branch February 15, 2023 00:40
@tobiasdiez
Copy link
Contributor

@dimpase If you choose "Squash" in the merge button dropdown, then the branch history of develop is a bit cleaner than with a classical merge.

@mkoeppe mkoeppe added this to the sage-10.0 milestone Feb 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cygwin CI failing
5 participants