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

meson CI: update clang to 19 (backport #3042) #3048

Merged
merged 1 commit into from
Sep 30, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 30, 2024


This is an automatic backport of pull request #3042 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Sep 30, 2024
Copy link
Contributor Author

mergify bot commented Sep 30, 2024

Cherry-pick of 2060029 has failed:

On branch mergify/bp/0.28.x/pr-3042
Your branch is up to date with 'origin/0.28.x'.

You are currently cherry-picking commit 206002902.
  (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/on_PR_meson.yaml

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 Sep 30, 2024
Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 2060029)

# Conflicts:
#	.github/workflows/on_PR_meson.yaml
@kmilos kmilos added this to the v0.28.4 milestone Sep 30, 2024
@kmilos kmilos removed the conflicts label Sep 30, 2024
@kmilos kmilos merged commit 193b643 into 0.28.x Sep 30, 2024
60 of 62 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-3042 branch September 30, 2024 17:24
@kmilos kmilos added the CI Issues related with CI jobs label Oct 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI Issues related with CI jobs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants