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

PD check: do not treat library names as package names (backport #9132) #9145

Merged
merged 1 commit into from
Sep 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 24, 2023

This is an automatic backport of pull request #9132 done by Mergify.
Cherry-pick of 4aa5f88 has failed:

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

You are currently cherry-picking commit 4aa5f8861.
  (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/Regression/T9122/p/p.cabal
	new file:   cabal-testsuite/PackageTests/Regression/T9122/q/q.cabal
	new file:   cabal-testsuite/PackageTests/Regression/T9122/setup.cabal.out
	new file:   cabal-testsuite/PackageTests/Regression/T9122/setup.out
	new file:   cabal-testsuite/PackageTests/Regression/T9122/setup.test.hs
	new file:   changelog.d/issue-9122

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cabal/src/Distribution/PackageDescription/Check.hs

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@Mikolaj
Copy link
Member

Mikolaj commented Sep 4, 2023

@fgaz: I think this backport request that you initiated did not go through. Is it fine to ignore so that the PR get published only in cabal 3.12? If so, could you close this PR?

@fgaz
Copy link
Member

fgaz commented Sep 5, 2023

@Mikolaj let's get this in 3.10.2. looks like there's a github outage right now so CI doesn't work, I'll rerun later

@Mikolaj
Copy link
Member

Mikolaj commented Sep 5, 2023

Sure. It still report "branch is out-of-date", though.

@fgaz fgaz force-pushed the mergify/bp/3.10/pr-9132 branch 2 times, most recently from ab81127 to 05179f6 Compare September 5, 2023 17:39
@Mikolaj
Copy link
Member

Mikolaj commented Sep 5, 2023

These look like genuine test failures now, right? A dot missing somewhere?

@fgaz fgaz force-pushed the mergify/bp/3.10/pr-9132 branch from 05179f6 to 4d0c2ea Compare September 6, 2023 06:43
@fgaz fgaz requested a review from Kleidukos September 6, 2023 09:51
@Kleidukos
Copy link
Member

@fgaz great, you can merge manually

@fgaz fgaz force-pushed the mergify/bp/3.10/pr-9132 branch from 4d0c2ea to 9093f32 Compare September 6, 2023 10:56
@fgaz fgaz merged commit 29e80e9 into 3.10 Sep 6, 2023
38 checks passed
@fgaz fgaz deleted the mergify/bp/3.10/pr-9132 branch September 6, 2023 13:27
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.

3 participants