Skip to content

Backport #10664: cabal.release.project: pick newer unix that fixes important bugs on i386 and arm#10665

Closed
mergify[bot] wants to merge 2 commits into3.14from
mergify/bp/3.14/pr-10664
Closed

Backport #10664: cabal.release.project: pick newer unix that fixes important bugs on i386 and arm#10665
mergify[bot] wants to merge 2 commits into3.14from
mergify/bp/3.14/pr-10664

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 23, 2024


Template B: This PR does not modify behaviour or interface

E.g. the PR only touches documentation or tests, does refactorings, etc.

Include the following checklist in your PR:

  • 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 #10664 done by [Mergify](https://mergify.com).

@mergify
Copy link
Contributor Author

mergify bot commented Dec 23, 2024

Cherry-pick of 41ce532 has failed:

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

You are currently cherry-picking commit 41ce532cf.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

@geekosaur
Copy link
Collaborator

Git rev stuff un-cherry-picked; that can be backported later if desired.

@geekosaur geekosaur mentioned this pull request Dec 25, 2024
@Kleidukos Kleidukos added merge me Tell Mergify Bot to merge merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days labels Dec 27, 2024
@Kleidukos
Copy link
Member

Kleidukos commented Dec 28, 2024

[__1] rejecting: unix-2.8.4.0/installed-2.8.4.0 (conflict: Cabal => unix>=2.8.6.0 && <2.9)

https://github.com/haskell/cabal/actions/runs/12527156226/job/34940451295?pr=10665#step:6:12

@ulysses4ever
Copy link
Collaborator

Why has index-state in this patch been downgraded from November to September 2024?

@Kleidukos
Copy link
Member

Probably my fault when I resolved a conflict.

@ulysses4ever
Copy link
Collaborator

That solved the solver issue.

@geekosaur
Copy link
Collaborator

Yeh, you have to be careful about that when resolving conflicts, I saw it multiple times while backporting fixes.

@mergify
Copy link
Contributor Author

mergify bot commented Dec 28, 2024

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

The pull request can't be updated

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.

If you want to requeue this pull request, you need to post a comment with the text: @mergifyio requeue

@ulysses4ever
Copy link
Collaborator

@Mergifyio requeue

@mergify
Copy link
Contributor Author

mergify bot commented Dec 28, 2024

requeue

✅ The queue state of this pull request has been cleaned. It can be re-embarked automatically

@mergify
Copy link
Contributor Author

mergify bot commented Dec 28, 2024

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

The pull request can't be updated

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.

If you want to requeue this pull request, you need to post a comment with the text: @mergifyio requeue

@ulysses4ever
Copy link
Collaborator

@Kleidukos I think this PR isn't needed after b28ee38 (already on 3.14 branch).

@ulysses4ever ulysses4ever force-pushed the mergify/bp/3.14/pr-10664 branch from 4859850 to a7f2dd6 Compare December 28, 2024 23:26
@ulysses4ever ulysses4ever removed merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge labels Dec 28, 2024
@ulysses4ever
Copy link
Collaborator

It needed rebase, which I did. But I took off the merge labels, so that @Kleidukos can decide whether we do it or not. I think we don't need it...

@Kleidukos
Copy link
Member

Perfect, if the constraints are already fixed that doesn't bother me to abort this PR.

@Kleidukos Kleidukos closed this Dec 29, 2024
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