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: increase minimum version to 0.54.1 (backport #2621) #2623

Merged
merged 1 commit into from
May 17, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 16, 2023

This is an automatic backport of pull request #2621 done by Mergify.
Cherry-pick of 3caa9fc has failed:

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

You are currently cherry-picking commit 3caa9fc0.
  (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:   meson.build

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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@ghost
Copy link

ghost commented May 16, 2023

👇 Click on the image for a new way to code review

Review these changes using an interactive CodeSee Map

Legend

CodeSee Map legend

@codecov
Copy link

codecov bot commented May 16, 2023

Codecov Report

Merging #2623 (43c993c) into 0.28.x (f804037) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           0.28.x    #2623   +/-   ##
=======================================
  Coverage   63.93%   63.93%           
=======================================
  Files         103      103           
  Lines       22298    22298           
  Branches    10789    10789           
=======================================
  Hits        14257    14257           
  Misses       5823     5823           
  Partials     2218     2218           
Impacted Files Coverage Δ
src/futils.cpp 73.09% <ø> (ø)

0.54.1 fixed a bug with cmake config files which meson 1.1.0 warns on.

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit 3caa9fc)
@neheb neheb force-pushed the mergify/bp/0.28.x/pr-2621 branch from e2e211d to 43c993c Compare May 17, 2023 17:09
@neheb neheb merged commit 4f9f106 into 0.28.x May 17, 2023
110 checks passed
@neheb neheb deleted the mergify/bp/0.28.x/pr-2621 branch May 17, 2023 17:51
@kevinbackhouse kevinbackhouse added this to the v0.28.1 milestone Nov 4, 2023
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.

None yet

2 participants