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

Include the CGL header on macOS #911

Merged
merged 1 commit into from
Sep 18, 2023
Merged

Conversation

mjcarroll
Copy link
Contributor

Fix break from #897

Signed-off-by: Michael Carroll <[email protected]>
@mjcarroll mjcarroll requested a review from iche033 as a code owner September 15, 2023 17:22
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Sep 15, 2023
@iche033
Copy link
Contributor

iche033 commented Sep 15, 2023

looks good, will wait for CI

@scpeters
Copy link
Member

@scpeters
Copy link
Member

thanks for the quick fix!

@codecov
Copy link

codecov bot commented Sep 15, 2023

Codecov Report

Merging #911 (3be43ed) into gz-rendering8 (8c1fd27) will not change coverage.
The diff coverage is n/a.

❗ Current head 3be43ed differs from pull request most recent head 7788a29. Consider uploading reports for the commit 7788a29 to get more accurate results

@@              Coverage Diff               @@
##           gz-rendering8     #911   +/-   ##
==============================================
  Coverage          75.18%   75.18%           
==============================================
  Files                177      177           
  Lines              16846    16846           
==============================================
  Hits               12665    12665           
  Misses              4181     4181           
Files Changed Coverage Δ
ogre2/src/Ogre2RenderEngine.cc 68.18% <ø> (ø)

@peci1 peci1 mentioned this pull request Sep 15, 2023
8 tasks
@scpeters
Copy link
Member

CI failure seems like a problem with the machine?

Build Status https://build.osrfoundation.org/job/gz_rendering-ci-pr_any-jammy-amd64/49/

27: [ RUN      ] HeightmapTest.Heightmap
27: X Error of failed request:  GLXBadDrawable
27:   Major opcode of failed request:  151 (GLX)
27:   Minor opcode of failed request:  5 (X_GLXMakeCurrent)
27:   Serial number of failed request:  58
27:   Current serial number in output stream:  58
27: �[1;36m[Dbg] [CommonRenderingTest.hh:44] �[0m�[1;36mRead GZ_ENGINE_TO_TEST=�[0m�[1;36mogre�[0m�[1;36m�[0m
27: �[1;36m[Dbg] [CommonRenderingTest.hh:47] �[0m�[1;36mRead GZ_ENGINE_BACKEND=�[0m�[1;36mgl3plus�[0m�[1;36m�[0m
27: �[1;32m[Msg] �[0m�[1;32mLoading plugin [�[0m�[1;32mgz-rendering-ogre�[0m�[1;32m]�[0m�[1;32m�[0m
 27/245 Test  #27: INTEGRATION_heightmap_ogre_gl3plus ....................***Failed    0.24 sec

@peci1
Copy link
Contributor

peci1 commented Sep 15, 2023

Or it could actually be a wrongly initialized GL context...

@azeey
Copy link
Contributor

azeey commented Sep 18, 2023

I reran the Jammy job and it passed (https://build.osrfoundation.org/job/gz_rendering-ci-pr_any-jammy-amd64/51/), so I'd say this is okay to merge.

@mjcarroll
Copy link
Contributor Author

Yeah, this should not have altered any jammy specific code paths, so maybe just a flake?

@mjcarroll mjcarroll merged commit 9d524c2 into gz-rendering8 Sep 18, 2023
7 checks passed
@mjcarroll mjcarroll deleted the mjcarroll/include_cgl branch September 18, 2023 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎵 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants