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 ForeignLibs test for Windows (backport #10212) #10219

Merged
merged 3 commits into from
Jul 21, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 21, 2024


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

(cherry picked from commit be1ae31)

# Conflicts:
#	cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs
Copy link
Contributor Author

mergify bot commented Jul 21, 2024

Cherry-pick of be1ae31 has failed:

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

You are currently cherry-picking commit be1ae3183.
  (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:
	new file:   cabal-testsuite/PackageTests/ForeignLibs/MyForeignLib.def
	modified:   cabal-testsuite/PackageTests/ForeignLibs/my-foreign-lib.cabal

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cabal-testsuite/PackageTests/ForeignLibs/setup.test.hs

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

@mergify mergify bot added the conflicts label Jul 21, 2024
@mergify mergify bot added the backport label Jul 21, 2024
@geekosaur geekosaur requested a review from jasagredo July 21, 2024 02:27
@geekosaur geekosaur added the squash+merge me Tell Mergify Bot to squash-merge label Jul 21, 2024
@jasagredo
Copy link
Collaborator

Thanks!

@mergify mergify bot merged commit 4eb7434 into 3.12 Jul 21, 2024
54 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-10212 branch July 21, 2024 20:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants