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

Re-enable Windows CI (backport #10282) #10308

Closed
wants to merge 1 commit into from
Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 2, 2024

This PR disables the 9.0.2 validate job for Windows and provides --io-manager=native for every other GHC. See #9571 for the reasons.


This is an automatic backport of pull request #10282 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Sep 2, 2024
Copy link
Contributor Author

mergify bot commented Sep 2, 2024

Cherry-pick of 4aade2d has failed:

On branch mergify/bp/3.12/pr-10282
Your branch is up to date with 'origin/3.12'.

You are currently cherry-picking commit 4aade2d8a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/validate.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cabal-testsuite/PackageTests/Backpack/Includes3/cabal-external.test.hs
	both modified:   validate.sh

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@geekosaur
Copy link
Collaborator

Worth noting: validate.yml should have had a merge conflict because the type of the exclusion list changed, but the first line that would have caused it was just outside the context that the merge uses. The result was GHA almost silently dropping the validate job. (GHA's diagnostics for invalid workflows leaves something to be desired.)

(cherry picked from commit 4aade2d)
@geekosaur
Copy link
Collaborator

So now we can't commit the Windows CI fixes to 3.12 because of the Hackage roundtrip tests, and we can't commit the Hackage roundtrip tests workaround to 3.12 because it needs the Windows CI fixes.

@geekosaur
Copy link
Collaborator

Cherry-picked into the Hackage round-trip backport.

@geekosaur geekosaur closed this Sep 2, 2024
@mergify mergify bot deleted the mergify/bp/3.12/pr-10282 branch September 2, 2024 01:30
@geekosaur geekosaur restored the mergify/bp/3.12/pr-10282 branch September 13, 2024 00:11
@geekosaur geekosaur reopened this Sep 13, 2024
@geekosaur
Copy link
Collaborator

Sorry, per above this needs to stay closed and I need to cherrypick the other Windows fixes.

@geekosaur geekosaur closed this Sep 13, 2024
@geekosaur geekosaur deleted the mergify/bp/3.12/pr-10282 branch September 13, 2024 00:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants