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

Backport #351: Support protobuf >= 22 #353

Merged
merged 1 commit into from
Jun 13, 2023

Conversation

scpeters
Copy link
Member

Backport #351 to fix finding the newest versions of protobuf, which is now in homebrew-core. Use rebase-and-merge.

Signed-off-by: Silvio Traversaro <[email protected]>
@scpeters scpeters requested a review from iche033 as a code owner June 10, 2023 01:07
@github-actions github-actions bot added the 🏰 citadel Ignition Citadel label Jun 10, 2023
@codecov
Copy link

codecov bot commented Jun 10, 2023

Codecov Report

Merging #353 (61bce5e) into ign-sensors3 (cb18240) will not change coverage.
The diff coverage is n/a.

❗ Current head 61bce5e differs from pull request most recent head f364179. Consider uploading reports for the commit f364179 to get more accurate results

@@              Coverage Diff              @@
##           ign-sensors3     #353   +/-   ##
=============================================
  Coverage         79.83%   79.83%           
=============================================
  Files                23       23           
  Lines              2380     2380           
=============================================
  Hits               1900     1900           
  Misses              480      480           

@scpeters
Copy link
Member Author

some test failures involving rendering on macOS; is that typical? I think it's unrelated to this PR

@scpeters
Copy link
Member Author

some test failures involving rendering on macOS; is that typical? I think it's unrelated to this PR

I'm retrying the job anyway

link to the previous test failures: https://build.osrfoundation.org/job/ignition_sensors-ci-pr_any-homebrew-amd64/1408/testReport/

@iche033
Copy link
Contributor

iche033 commented Jun 13, 2023

some test failures involving rendering on macOS; is that typical? I think it's unrelated to this PR

hmm could be failing already. We made most of our mac test fixes in fortress and garden and not in citadel because gz-rendering + ogre 2.x isn't really working on mac in citadel

@scpeters
Copy link
Member Author

some test failures involving rendering on macOS; is that typical? I think it's unrelated to this PR

hmm could be failing already. We made most of our mac test fixes in fortress and garden and not in citadel because gz-rendering + ogre 2.x isn't really working on mac in citadel

ok, I'll go ahead and merge then

@scpeters scpeters merged commit 3ace7ae into ign-sensors3 Jun 13, 2023
@scpeters scpeters deleted the scpeters/pick_protobuf_fix branch June 13, 2023 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏰 citadel Ignition Citadel
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants