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

regenerate bootstrap files without arch-native (backport #10148) #10150

Merged
merged 1 commit into from
Aug 1, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 24, 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 #10148 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Jun 24, 2024
Copy link
Contributor Author

mergify bot commented Jun 24, 2024

Cherry-pick of aede6c4 has failed:

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

You are currently cherry-picking commit aede6c4ea.
  (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.bootstrap.project

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bootstrap/linux-9.0.2.json
	both modified:   bootstrap/linux-9.2.8.json
	both modified:   bootstrap/linux-9.4.8.json
	both modified:   bootstrap/linux-9.6.4.json
	both modified:   bootstrap/linux-9.8.2.json

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 added the backport label Jun 25, 2024
@geekosaur geekosaur added merge me Tell Mergify Bot to merge and removed conflicts merge me Tell Mergify Bot to merge labels Jun 25, 2024
@geekosaur geekosaur force-pushed the mergify/bp/master/pr-10148 branch 2 times, most recently from ee6d374 to 33a0b4f Compare June 25, 2024 00:41
Copy link
Member

@Mikolaj Mikolaj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Mikolaj
Copy link
Member

Mikolaj commented Jun 29, 2024

@geekosaur: shall we merge this (add the label)?

@geekosaur geekosaur added the merge me Tell Mergify Bot to merge label Jun 29, 2024
@geekosaur
Copy link
Collaborator

Sorry, I thought this was already in.

@geekosaur
Copy link
Collaborator

geekosaur commented Jun 29, 2024

It looks like our rules for backports have stopped working? It's only supposed to require one review. (No, #10135 hasn't landed yet, so it's not a typo or thinko there.)

@geekosaur geekosaur force-pushed the mergify/bp/master/pr-10148 branch 2 times, most recently from 0283d6b to 406a24a Compare July 30, 2024 01:36
@geekosaur
Copy link
Collaborator

This is on master so the backport rules wouldn't apply anyway: we need an additional reviewer.

@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Aug 1, 2024
(cherry picked from commit aede6c4)

Also remove 8.10.7 to match 3.12 branch.
@mergify mergify bot merged commit b3b9052 into master Aug 1, 2024
52 checks passed
@mergify mergify bot deleted the mergify/bp/master/pr-10148 branch August 1, 2024 21:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants