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

Backport #10654: CI: remove cabal-head before updating it (fix #10537) #10657

Merged
merged 2 commits into from
Dec 21, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 20, 2024

This PR is #10540 rebased.

It should fix #10537 and its duplicate #10652


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

@mergify mergify bot added the conflicts label Dec 20, 2024
Copy link
Contributor Author

mergify bot commented Dec 20, 2024

Cherry-pick of 9949014 has failed:

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

You are currently cherry-picking commit 994901461.
  (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:   .github/workflows/validate.yml

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 geekosaur force-pushed the mergify/bp/3.12/pr-10654 branch from 7eff8c8 to 45449d1 Compare December 20, 2024 17:50
@geekosaur
Copy link
Collaborator

geekosaur commented Dec 20, 2024

Mmm, this isn't going to work; I'll need to cherry-pick the token fix into it and kill the other backport.
/cc: @Kleidukos

@geekosaur geekosaur added the squash+merge me Tell Mergify Bot to squash-merge label Dec 21, 2024
@mergify mergify bot merged commit 1d84640 into 3.12 Dec 21, 2024
54 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-10654 branch December 21, 2024 03:48
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