Skip to content

Fix Cygwin CI after #32841#35052

Merged
dimpase merged 2 commits intodevelopfrom
fix-develop
Feb 15, 2023
Merged

Fix Cygwin CI after #32841#35052
dimpase merged 2 commits intodevelopfrom
fix-develop

Conversation

@mkoeppe
Copy link
Copy Markdown
Contributor

@mkoeppe mkoeppe commented Feb 9, 2023 •
edited
Loading

📚 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
Copy Markdown
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
Copy Markdown
Contributor

roed314 commented Feb 9, 2023

You should probably also merge develop.

@mkoeppe
Copy link
Copy Markdown
Contributor Author

mkoeppe commented Feb 9, 2023 •
edited
Loading

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
Copy Markdown
Contributor Author

mkoeppe commented Feb 9, 2023

You should probably also merge develop.

No need; nothing else touches these files.

@roed314
Copy link
Copy Markdown
Contributor

roed314 commented Feb 9, 2023

Ok.

roed314
roed314 approved these changes Feb 9, 2023
View reviewed changes
Copy link
Copy Markdown
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
Copy Markdown
Contributor Author

mkoeppe commented Feb 9, 2023

Thanks, David!

@dimpase
Copy link
Copy Markdown
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
Copy Markdown
Member

dimpase commented Feb 15, 2023

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

@mkoeppe
Copy link
Copy Markdown
Contributor Author

mkoeppe commented Feb 15, 2023

What is fix-develop?

@mkoeppe
Copy link
Copy Markdown
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
@tobiasdiez
Copy link
Copy Markdown
Contributor

tobiasdiez commented Feb 15, 2023

@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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@roed314 roed314 roed314 approved these changes

Assignees

No one assigned

Labels

p: blocker / 1

Projects

None yet

Milestone

sage-10.0

Development

Successfully merging this pull request may close these issues.

Cygwin CI failing

5 participants

@mkoeppe @roed314 @dimpase @tobiasdiez @kwankyu