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

chore: Bump ninja to 1.12 on Windows (backport #141) #142

Merged
merged 1 commit into from
Apr 22, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 22, 2024


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

Copy link
Author

mergify bot commented Apr 22, 2024

Cherry-pick of 31eb857 has failed:

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

You are currently cherry-picking commit 31eb857.
  (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/runtime-ci.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 added the conflicts label Apr 22, 2024
@ebariche ebariche force-pushed the mergify/bp/release/8.0/pr-141 branch from b9da849 to ca4fa6d Compare April 22, 2024 19:16
@ebariche ebariche merged commit 498e18e into release/8.0 Apr 22, 2024
13 checks passed
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/release/8.0/pr-141 branch April 22, 2024 19:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant