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.

Sign up for GitHub

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

Jump to bottom

Merge: 8 -> main #391

Merged
merged 17 commits into from
Oct 10, 2023
Merged

Merge: 8 -> main #391

merged 17 commits into from
Oct 10, 2023

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Oct 10, 2023

➡️ Forward port

Port gz-sensors8 to main

Branch comparison: main...gz-sensors8

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

Levi-Armstrong and others added 17 commits July 21, 2023 10:16
@Levi-Armstrong
Fix CameraSensor to check if element is null before access (#361)
44c67b0 
* Fix CameraSensor to check if element is null before access

Signed-off-by: Levi Armstrong <[email protected]>
@Levi-Armstrong
Expose optical frame in CameraSensor so it can be set in DepthCameraS…
4300c17 
…ensor (#362)

Signed-off-by: Levi Armstrong <[email protected]>
@azeey
Fix Github project automation for new project board (#371)
4881904 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey
Use pull_request_target for triage workflow (#372)
7b4387f 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@ahcorde
Update README.md (#378)
cb20312 
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
@iche033
update introduction text (#381)
fc18ada 
Signed-off-by: Ian Chen <[email protected]>
@iche033
update readme (#380)
a776d8a 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Minor tweak to thermal camera tutorial (#379)
f504526 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Replace ign with gz and update windows instructions in installation t…
11bf731 
…utorial (#382)


---------

Signed-off-by: Ian Chen <[email protected]>
@iche033
update ci badge (#385)
cf62d0f 
Signed-off-by: Ian Chen <[email protected]>
@azeey
7.3.0 release (#386)
ec52913 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@iche033
Merge from gz-sensors7
1caa53b 
Signed-off-by: Ian Chen <[email protected]>
@azeey
Merge pull request #387 from gazebosim/merge_7_8_20230926
f48aab8 
Merge 7 -> 8
@azeey
Update changelog and prepare for pre2 (#388)
bb08963 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey
Prepare for 8.0.0 Release (#389)
abca8da 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@iche033
merge from gz-sensors8
d90e0a1 
Signed-off-by: Ian Chen <[email protected]>
@iche033
fix build
2cab123 
Signed-off-by: Ian Chen <[email protected]>
@iche033 iche033 force-pushed the merge_8_main_20231010 branch from 4d7d31a to 2cab123 Compare October 10, 2023 17:35
@codecov
Copy link

codecov bot commented Oct 10, 2023 •
edited
Loading

Codecov Report

Merging #391 (ff58f62) into main (bd695b2) will increase coverage by 0.02%.
The diff coverage is 100.00%.

❗ Current head ff58f62 differs from pull request most recent head 2cab123. Consider uploading reports for the commit 2cab123 to get more accurate results

@@            Coverage Diff             @@
##             main     #391      +/-   ##
==========================================
+ Coverage   72.32%   72.34%   +0.02%     
==========================================
  Files          37       37              
  Lines        5048     5052       +4     
==========================================
+ Hits         3651     3655       +4     
  Misses       1397     1397
Files Coverage Δ
src/CameraSensor.cc 75.49% <100.00%> (+0.18%) ⬆️
src/DepthCameraSensor.cc 70.90% <100.00%> (+0.09%) ⬆️

@azeey
Copy link
Contributor

azeey commented Oct 10, 2023

Windows is failing with

CameraSensor.obj : MSIL .netmodule or module compiled with /GL found; restarting link with /LTCG; add /LTCG to the link command line to improve linker performance

     Creating library C:/J/workspace/ign_sensors-pr-win/ws/build/gz-sensors8/lib/Release/gz-sensors8-camera.lib and object C:/J/workspace/ign_sensors-pr-win/ws/build/gz-sensors8/lib/Release/gz-sensors8-camera.exp

CameraSensor.obj : error LNK2001: unresolved external symbol "class gz::math::v7::Matrix4<double> __cdecl gz::sensors::v8::buildProjectionMatrix(double,double,double,double,double,double,double,double,double)" (?buildProjectionMatrix@v8@sensors@gz@@YA?AV?$Matrix4@N@v7@math@3@NNNNNNNNN@Z) [C:\J\workspace\ign_sensors-pr-win\ws\build\gz-sensors8\src\gz-sensors8-camera.vcxproj]

C:\J\workspace\ign_sensors-pr-win\ws\build\gz-sensors8\bin\Release\gz-sensors8-camera.dll : fatal error LNK1120: 1 unresolved externals [C:\J\workspace\ign_sensors-pr-win\ws\build\gz-sensors8\src\gz-sensors8-camera.vcxproj]

@azeey azeey mentioned this pull request Oct 10, 2023
Merged
azeey
azeey approved these changes Oct 10, 2023
View reviewed changes
Copy link
Contributor

@azeey azeey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving since the build failure started in #390.

@iche033
Copy link
Contributor Author

iche033 commented Oct 10, 2023

I'll fix it in a separate PR

@iche033 iche033 merged commit d44b7dc into main Oct 10, 2023
6 checks passed
@iche033 iche033 deleted the merge_8_main_20231010 branch October 10, 2023 20:49
@iche033 iche033 mentioned this pull request Oct 10, 2023
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@azeey azeey azeey approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@iche033 @azeey @Levi-Armstrong @ahcorde