Skip to content

Add required-fields to changelog.d config (backport #9810)#10005

Merged
mergify[bot] merged 4 commits into3.12from
mergify/bp/3.12/pr-9810
May 14, 2024
Merged

Add required-fields to changelog.d config (backport #9810)#10005
mergify[bot] merged 4 commits into3.12from
mergify/bp/3.12/pr-9810

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 13, 2024

See https://codeberg.org/fgaz/changelog-d/issues/6

Template Β: This PR does not modify cabal behaviour (documentation, tests, refactoring, 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 #9810 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label May 13, 2024
@mergify
Copy link
Contributor Author

mergify bot commented May 13, 2024

Cherry-pick of 5168b01 has failed:

On branch mergify/bp/3.12/pr-9810
Your branch is ahead of 'origin/3.12' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 5168b01c1.
  (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:   changelog.d/config

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   changelog.d/issue-8680
	deleted by us:   changelog.d/issue-9098-lexbraces
	deleted by us:   changelog.d/issue-9678
	deleted by us:   changelog.d/issue-9736
	deleted by us:   changelog.d/pkgconfig-once

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 13, 2024
Merged
2 tasks
@mergify mergify bot added the backport label May 13, 2024
fgaz added 2 commits May 13, 2024 13:10
@fgaz @ulysses4ever
changelog-d moved to codeberg
e50ca7c 
(cherry picked from commit 067967e)
@fgaz @ulysses4ever
Add required-fields to changelog.d config
89191ac 
(cherry picked from commit 5168b01)

# Conflicts:
#	changelog.d/issue-8680
#	changelog.d/issue-9098-lexbraces
#	changelog.d/issue-9678
#	changelog.d/issue-9736
#	changelog.d/pkgconfig-once
@ulysses4ever ulysses4ever force-pushed the mergify/bp/3.12/pr-9810 branch from 6b26966 to 89191ac Compare May 13, 2024 17:10
@ulysses4ever
Copy link
Collaborator

ulysses4ever commented May 13, 2024

@mergify rebase

@mergify
Copy link
Contributor Author

mergify bot commented May 13, 2024

rebase

✅ Nothing to do for rebase action

@ulysses4ever ulysses4ever added the squash+merge me Tell Mergify Bot to squash-merge label May 14, 2024
@mergify mergify bot merged commit a06f4e9 into 3.12 May 14, 2024
@mergify mergify bot deleted the mergify/bp/3.12/pr-9810 branch May 14, 2024 22:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ulysses4ever ulysses4ever ulysses4ever approved these changes

Assignees

No one assigned

Labels

backport squash+merge me Tell Mergify Bot to squash-merge

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ulysses4ever @fgaz