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

4 ➡️ 5 (main) #320

Merged
merged 7 commits into from
Mar 17, 2022
Merged

4 ➡️ 5 (main) #320

merged 7 commits into from
Mar 17, 2022

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-common4 to main

Branch comparison: main...ign-common4

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

nkoenig and others added 3 commits February 18, 2022 18:34
@nkoenig
Minor typo in filesystem documentation (#313)
0ca84e3 
Signed-off-by: Nate Koenig <[email protected]>
@scpeters @mjcarroll
Add CI support for Jammy (#316)
bde2937 
Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
@mjcarroll @chapulina
Add some tests for parentPath/basename (#309)
ad0fc88 
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Co-authored-by: Louise Poubel <[email protected]>
@chapulina chapulina requested a review from mjcarroll as a code owner March 3, 2022 19:14
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Mar 3, 2022
@mjcarroll
Copy link
Contributor

Looks like this is conflicted/failing CI.

@chapulina
4 ➡️ 5 (main)
8cd81a9 
Signed-off-by: Louise Poubel <[email protected]>
@codecov
Copy link

codecov bot commented Mar 10, 2022 •
edited
Loading

Codecov Report

Merging #320 (9d1ba90) into main (af583c9) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main     #320   +/-   ##
=======================================
  Coverage   77.12%   77.12%           
=======================================
  Files          76       76           
  Lines       10529    10529           
=======================================
  Hits         8121     8121           
  Misses       2408     2408
Impacted Files Coverage Δ
include/ignition/common/Filesystem.hh 100.00% <ø> (ø)

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 af583c9...9d1ba90. Read the comment docs.

@chapulina
Copy link
Contributor Author

Now pending libignition-math7-dev as part of

@chapulina chapulina mentioned this pull request Mar 10, 2022
Closed
@chapulina
Copy link
Contributor Author

humm still having some Jammy CI issues

  The following packages have unmet dependencies:
   ruby-kramdown : Depends: ruby-rexml but it is not installable
                   Recommends: ruby-rouge but it is not going to be installed

This was referenced Mar 16, 2022
Closed
Merged
@mjcarroll
Copy link
Contributor

@osrf-jenkins retest this please

1 similar comment
@mjcarroll
Copy link
Contributor

@osrf-jenkins retest this please

@mjcarroll mjcarroll merged commit caafd64 into main Mar 17, 2022
@mjcarroll mjcarroll deleted the chapulina/4_to_5 branch March 17, 2022 14:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mjcarroll mjcarroll mjcarroll approved these changes

Assignees
No one assigned
Labels
🌱 garden Ignition Garden
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@chapulina @mjcarroll @nkoenig @scpeters