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

More consistently pass --package-db flag to tests (backport #9954) #10067

Merged
merged 2 commits into from
Jun 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 3, 2024

Previously --package-db was only passed to test which used the v2- prefix.

Now we pass --package-db to things which use the v2- prefix, not things which use the v1- prefix and by default assume that unprefixed commands are v2 commands.

Please read Github PR Conventions and then fill in one of these two templates.

  • Patches conform to the coding conventions.
  • Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

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

Previously `--package-db` was only passed to test which used the `v2-`
prefix.

Now we pass `--package-db` to things which use the `v2-` prefix, not
things which use the `v1-` prefix and by default assume that unprefixed
commands are v2 commands.

(cherry picked from commit 2b44677)

# Conflicts:
#	cabal-testsuite/PackageTests/CustomTestCoverage/cabal.out
Copy link
Contributor Author

mergify bot commented Jun 3, 2024

Cherry-pick of 2b44677 has failed:

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

You are currently cherry-picking commit 2b44677c3.
  (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:   cabal-testsuite/PackageTests/Regression/T9640/cabal.out
	modified:   cabal-testsuite/src/Test/Cabal/DecodeShowBuildInfo.hs
	modified:   cabal-testsuite/src/Test/Cabal/Prelude.hs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cabal-testsuite/PackageTests/CustomTestCoverage/cabal.out

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

@ulysses4ever ulysses4ever added squash+merge me Tell Mergify Bot to squash-merge and removed conflicts labels Jun 3, 2024
@mergify mergify bot merged commit a437d82 into 3.12 Jun 3, 2024
49 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-9954 branch June 3, 2024 19:46
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