Merge the code for the Windows GitHub Actions job with that of the UNIX jobs #1111
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wilfwilson
added
the
ci
wilfwilson
force-pushed
the
ci-merge-cygwin-job
branch
7 times, most recently
from
0bfe1da to
16f4699
Compare
wilfwilson
force-pushed
the
ci-merge-cygwin-job
branch
3 times, most recently
from
33e7305 to
922c31e
Compare
wilfwilson
force-pushed
the
ci-merge-cygwin-job
branch
3 times, most recently
from
80ab294 to
6994974
Compare
Collaborator
Author
|
I've rebased this and it's now a single commit that is ready for review, and hopefully merging. |
Collaborator
|
Thanks @wilfwilson , any chance you could also merge the changes into main at some point, I tried to do this earlier today, but it seemed non-trivial |
Collaborator
Author
|
Yeah the conflicts arose because dependabot has been making changes to the CI in |
Collaborator
Author
|
@james-d-mitchell Done! |
wilfwilson
force-pushed
the
ci-merge-cygwin-job
branch
from
6994974 to
44bf92a
Compare
Collaborator
Author
|
@james-d-mitchell Please merge this one ASAP. That should get the tests passing again in the stable branch. |
james-d-mitchell
force-pushed
the
ci-merge-cygwin-job
branch
from
97dea53 to
b313881
Compare
Collaborator
|
@wilfwilson any chance you could sort out the rebase here? I've tried but it seems a little complicated, and you'll undoubtedly do a superior job. |
wilfwilson
force-pushed
the
ci-merge-cygwin-job
branch
from
b313881 to
cb4a003
Compare
Collaborator
Author
|
I've rebased and will merge if everything passes |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As of #1110, the code for the Windows job no longer really has any special cases, so it doesn't have to be kept separate any more.
This PR requires #1110. So I won't mark this as ready for review until #1110 is merged, at which point I'll rebase and there will only be the final commit remaining.