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

Merge 6 ➡️ 7 #604

Merged
merged 7 commits into from
Jan 8, 2024
Merged

Merge 6 ➡️ 7 #604

merged 7 commits into from
Jan 8, 2024

Conversation

jennuine
Copy link
Contributor

@jennuine jennuine commented Jan 5, 2024

➡️ Forward port

Port ign-gui6 to gz-gui7

Branch comparison: gz-gui7...ign-gui6

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

traversaro and others added 6 commits June 13, 2023 08:34
* Use on `push` only on stable branches to avoid duplicate runs
* Update project automation

Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge ign-gui3 ➡️  ign-gui6
@jennuine jennuine added the 🌱 garden Ignition Garden label Jan 5, 2024
@jennuine jennuine requested review from azeey and iche033 January 5, 2024 19:33
@jennuine jennuine self-assigned this Jan 5, 2024
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Jan 5, 2024
@jennuine jennuine changed the base branch from gz-gui8 to gz-gui7 January 5, 2024 19:33
@azeey
Copy link
Contributor

azeey commented Jan 8, 2024

Steve's suggestion: git commit --amend and then git push --force-with-lease.

@azeey
Copy link
Contributor

azeey commented Jan 8, 2024

@osrf-jenkins run tests please

Signed-off-by: Jenn Nguyen <[email protected]>
Copy link

codecov bot commented Jan 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (8dae037) 72.98% compared to head (d54c96a) 72.99%.

Additional details and impacted files
@@           Coverage Diff            @@
##           gz-gui7     #604   +/-   ##
========================================
  Coverage    72.98%   72.99%           
========================================
  Files           55       55           
  Lines         4927     4928    +1     
========================================
+ Hits          3596     3597    +1     
  Misses        1331     1331           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@azeey azeey merged commit 463272a into gz-gui7 Jan 8, 2024
11 checks passed
@azeey azeey deleted the jennuine/6_to_7 branch January 8, 2024 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden 🎵 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants