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

4 ➡️ 5 (main) #320

Merged
merged 7 commits into from
Mar 17, 2022
Merged

4 ➡️ 5 (main) #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0ca84e3
Minor typo in filesystem documentation (#313)
nkoenig Feb 18, 2022
bde2937
Add CI support for Jammy (#316)
scpeters Feb 25, 2022
ad0fc88
Add some tests for parentPath/basename (#309)
mjcarroll Mar 3, 2022
8cd81a9
4 ➡️ 5 (main)
chapulina Mar 10, 2022
7fad0b4
packages.apt: don't install ruby-ronn (#324)
scpeters Mar 16, 2022
4023c7d
Merge branch 'ign-common4' into chapulina/4_to_5
scpeters Mar 16, 2022
9d1ba90
Merge branch 'main' into chapulina/4_to_5
scpeters Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ libignition-utils1-dev
libswscale-dev
libtinyxml2-dev
pkg-config
ruby-ronn
uuid-dev
10 changes: 10 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,13 @@ jobs:
uses: ignition-tooling/action-ignition-ci@focal
with:
codecov-enabled: true
jammy-ci:
runs-on: ubuntu-latest
name: Ubuntu Jammy CI
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Compile and test
id: ci
uses: ignition-tooling/action-ignition-ci@jammy

2 changes: 1 addition & 1 deletion include/ignition/common/Filesystem.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ namespace ignition
/// files, by appending numbers to it (i.e. (0), (1), ...)
/// \param[in] _pathAndName Full absolute path and file name up to the
/// file extension.
/// \param[in] _extension File extension, such as "ddf".
/// \param[in] _extension File extension, such as "sdf".
/// \return Full path with name and extension, which doesn't collide with
/// existing files
std::string IGNITION_COMMON_VISIBLE uniqueFilePath(
Expand Down