Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Mar 11, 2025

Update workflows, settings, and README


This is an automatic backport of pull request #175 done by Mergify.

(cherry picked from commit ad756b1)

# Conflicts:
#	.github/dependabot.yml
@mergify
Copy link
Author

mergify bot commented Mar 11, 2025

Cherry-pick of ad756b1 has failed:

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

You are currently cherry-picking commit ad756b1.
  (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:
	new file:   .github/mergify.yml
	new file:   .github/workflows/jazzy-binary-downstream-build.yml
	new file:   .github/workflows/jazzy-build.yml
	new file:   .github/workflows/jazzy-pre-commit.yml
	modified:   .github/workflows/rolling-binary-downstream-build.yml
	modified:   .github/workflows/rolling-build.yml
	modified:   .github/workflows/rolling-pre-commit.yml
	modified:   README.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/dependabot.yml

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 conflicts label Mar 11, 2025
@christophfroehlich christophfroehlich merged commit 5d80c42 into humble Mar 12, 2025
6 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-175 branch March 12, 2025 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants