Skip to content

Backport #10746: Fix file+noindex URI usage on Windows#10876

Merged
mergify[bot] merged 5 commits into3.14from
mergify/bp/3.14/pr-10746
Mar 28, 2025
Merged

Backport #10746: Fix file+noindex URI usage on Windows#10876
mergify[bot] merged 5 commits into3.14from
mergify/bp/3.14/pr-10746

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 28, 2025

Concluded on using file+noindex:C:/some/path on Windows as discussed on Matrix.

Template Α: This PR modifies behaviour or interface

Include the following checklist in your PR:


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

(cherry picked from commit 9a0e8a4)

# Conflicts:
#	Makefile
@mergify mergify bot added the conflicts label Mar 28, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Mar 28, 2025

Cherry-pick of 9a0e8a4 has failed:

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

You are currently cherry-picking commit 9a0e8a46a.
  (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-syntax/src/Distribution/Utils/Path.hs
	modified:   cabal-install/src/Distribution/Client/Config.hs
	modified:   cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs
	modified:   cabal-install/src/Distribution/Client/Types/Repo.hs
	modified:   cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs
	modified:   cabal-testsuite/src/Test/Cabal/OutputNormalizer.hs
	modified:   cabal-testsuite/src/Test/Cabal/Prelude.hs
	modified:   changelog.d/pr-10728
	modified:   doc/config.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Makefile

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 mentioned this pull request Mar 28, 2025
6 tasks
@mergify mergify bot added the backport label Mar 28, 2025
@Mikolaj Mikolaj added the squash+merge me Tell Mergify Bot to squash-merge label Mar 28, 2025
@Mikolaj
Copy link
Member

Mikolaj commented Mar 28, 2025

@mergify rebase

@mergify
Copy link
Contributor Author

mergify bot commented Mar 28, 2025

rebase

☑️ Nothing to do

Details
  • queue-position = -1 [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • -conflict [📌 rebase requirement]
  • any of:
    • #commits > 1 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]
    • #commits-behind > 0 [📌 rebase requirement]

@Mikolaj
Copy link
Member

Mikolaj commented Mar 28, 2025

@mergify rebase

@mergify
Copy link
Contributor Author

mergify bot commented Mar 28, 2025

rebase

☑️ Nothing to do

Details
  • queue-position = -1 [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • -conflict [📌 rebase requirement]
  • any of:
    • #commits > 1 [📌 rebase requirement]
    • #commits-behind > 0 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]

@mergify
Copy link
Contributor Author

mergify bot commented Mar 28, 2025

This pull request has been removed from the queue for the following reason: checks failed.

The merge conditions cannot be satisfied due to failing checks:

You may have to fix your CI before adding the pull request to the queue again.
If you update this pull request, to fix the CI, it will automatically be requeued once the queue conditions match again.
If you think this was a flaky issue instead, you can requeue the pull request, without updating it, by posting a @mergifyio requeue comment.

@Mikolaj
Copy link
Member

Mikolaj commented Mar 28, 2025

@mergify dequeue

@mergify
Copy link
Contributor Author

mergify bot commented Mar 28, 2025

dequeue

☑️ The pull request is not queued

@mergify mergify bot merged commit 9b57ba1 into 3.14 Mar 28, 2025
59 checks passed
@mergify mergify bot deleted the mergify/bp/3.14/pr-10746 branch March 28, 2025 23:30
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.

4 participants