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

merge queue: embarking 3.10 (36a7f2f) and #9125 together #9127

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 14, 2023

🎉 This pull request has been checked successfully and will be merged. 🎉

Branch 3.10 (36a7f2f) and #9125 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #9125.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue default for merge:

  • #approved-reviews-by>=1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by=0 [🛡 GitHub branch protection]
  • any of [🛡 GitHub branch protection]:
    • check-success=Doctest Cabal
    • check-neutral=Doctest Cabal
    • check-skipped=Doctest Cabal
  • any of [🛡 GitHub branch protection]:
    • check-success=Meta checks
    • check-neutral=Meta checks
    • check-skipped=Meta checks
  • any of [🛡 GitHub branch protection]:
    • check-success=Validate post job
    • check-neutral=Validate post job
    • check-skipped=Validate post job
  • any of [🛡 GitHub branch protection]:
    • check-success=docs/readthedocs.org:cabal
    • check-neutral=docs/readthedocs.org:cabal
    • check-skipped=docs/readthedocs.org:cabal
  • any of [🛡 GitHub branch protection]:
    • check-success=Bootstrap ubuntu-latest ghc-8.10.7
    • check-neutral=Bootstrap ubuntu-latest ghc-8.10.7
    • check-skipped=Bootstrap ubuntu-latest ghc-8.10.7
  • any of [🛡 GitHub branch protection]:
    • check-success=Bootstrap ubuntu-latest ghc-9.0.2
    • check-neutral=Bootstrap ubuntu-latest ghc-9.0.2
    • check-skipped=Bootstrap ubuntu-latest ghc-9.0.2

Visit the Mergify Dashboard to check the state of the queue default.


More information about Mergify merge queue can be found in the documentation.

Mergify commands

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

  • @Mergifyio refresh will re-evaluate the queue rules

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

---
pull_requests:
  - number: 9125
...

frasertweedale and others added 3 commits July 14, 2023 14:52
The password-command option does not parse its value correctly.
Quotes are ignored, making many kinds of commands impossible to
express (e.g.  `sh -c "foo | bar"`).  Also, `cabal user-config`
treats the argument list as a *list of option values*, rather than a
*value that is a list*.  As a consequence, `cabal user-config
update` corrupts the value in the config file.

Fix these issues by parsing the command as a space separated list of
tokens, and changing the getter to `unwords` the value and return a
*singleton* list.  Also update the argument placeholder from
`PASSWORD` to `COMMAND`.

Fixes: #6268
(cherry picked from commit 95f48ad)

# Conflicts:
#	cabal-install/src/Distribution/Client/Setup.hs
#	cabal-install/src/Distribution/Deprecated/ParseUtils.hs
@mergify mergify bot closed this Jul 14, 2023
@mergify mergify bot deleted the mergify/merge-queue/2a864875dc branch July 14, 2023 22:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants