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

Fix macOS build failure (backport #1962) #1966

Merged
merged 2 commits into from
Oct 19, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 17, 2021

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


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.io/

This reverts commit e667346.

(cherry picked from commit d2bdf68)
(cherry picked from commit cf6566b)
@mergify mergify bot mentioned this pull request Oct 17, 2021
@kevinbackhouse kevinbackhouse added this to the v0.27.5 milestone Oct 17, 2021
@kevinbackhouse kevinbackhouse added build CI Issues related with CI jobs CMake Configuration issues related with CMake labels Oct 17, 2021
@codecov
Copy link

codecov bot commented Oct 17, 2021

Codecov Report

Merging #1966 (a1e6e3e) into 0.27-maintenance (d3f7e92) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@                Coverage Diff                @@
##           0.27-maintenance    #1966   +/-   ##
=================================================
  Coverage             46.32%   46.32%           
=================================================
  Files                   146      146           
  Lines                 22950    22950           
  Branches              11781    11781           
=================================================
  Hits                  10632    10632           
  Misses                 6702     6702           
  Partials               5616     5616           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d3f7e92...a1e6e3e. Read the comment docs.

This was referenced Oct 17, 2021
@kevinbackhouse
Copy link
Collaborator

@clanmills: this one should fix the macOS build issues on 0.27-maintenance.

@clanmills clanmills merged commit 1f950b0 into 0.27-maintenance Oct 19, 2021
@clanmills clanmills deleted the mergify/bp/0.27-maintenance/pr-1962 branch October 19, 2021 11:16
@clanmills
Copy link
Collaborator

Thanks for fixing this, @kevinbackhouse. Almost there. Waiting to see how the dust settles with David's src/bmffimage.cpp changes and I hope Milos will build/test them in dt (darktable) Then we'll not be in dt (deadly trouble).

@clanmills clanmills mentioned this pull request Oct 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build CI Issues related with CI jobs CMake Configuration issues related with CMake
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants