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

CI: install changelog-d from bindist (backport #10048) #10053

Merged
merged 3 commits into from
Jun 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 23, 2024

This will avoid build problems when the GHC in the CI environment is updated sooner than expected.
Previous breakage: #9177 (comment)


Template B: This PR does not modify behaviour or interface

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

This will avoid build problems when the GHC in the CI environment
is updated sooner than expected.
Previous breakage: #9177 (comment)

(cherry picked from commit d1a6ced)

# Conflicts:
#	.github/workflows/changelogs.yml
@mergify mergify bot added the conflicts label May 23, 2024
Copy link
Contributor Author

mergify bot commented May 23, 2024

Cherry-pick of d1a6ced has failed:

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

You are currently cherry-picking commit d1a6ced03.
  (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/changelogs.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

@mergify mergify bot mentioned this pull request May 23, 2024
2 tasks
@mergify mergify bot added the backport label May 23, 2024
@ulysses4ever ulysses4ever added conflicts squash+merge me Tell Mergify Bot to squash-merge and removed conflicts labels May 26, 2024
@mergify mergify bot merged commit 42b93b7 into 3.12 Jun 7, 2024
53 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-10048 branch June 7, 2024 00:38
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