Skip to content

Commit ca3b77f

Browse files
authored
Merge pull request #39 from RevolveNTNU/uavcan-dsdl
changed from '.uavcan' to '.dsdl' in DsdlParser. Also updated the build and test so these use v4: updated from v2 -> v4: - uses: actions/checkout@v3 - uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4 Otherwise the test would not run, because of the outdated package.
2 parents 746a1a3 + d3a7436 commit ca3b77f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/build_and_test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616
- name: Setup .NET
1717
uses: actions/setup-dotnet@v1
1818
with:
@@ -31,12 +31,12 @@ jobs:
3131
outputFormat: 'lcov'
3232
excludes: '[program]*,[test]test.*'
3333

34-
- uses: actions/upload-artifact@v2
34+
- uses: actions/upload-artifact@v4
3535
if: ${{ always() }}
3636
with:
3737
name: test_report
3838
path: /home/runner/work/RevolveUavcan/RevolveUavcan/RevolveUavcanTest/TestResults/test-results.trx
39-
- uses: actions/upload-artifact@v2
39+
- uses: actions/upload-artifact@v4
4040
if: ${{ always() }}
4141
with:
4242
name: coverage_report
@@ -51,4 +51,4 @@ jobs:
5151
with:
5252
name: Test Report # Name of the check run which will be created
5353
path: /home/runner/work/RevolveUavcan/RevolveUavcan/RevolveUavcanTest/TestResults/test-results.trx # Path to test results
54-
reporter: dotnet-trx # Format of test results
54+
reporter: dotnet-trx # Format of test results

RevolveUavcan/Dsdl/DsdlParser.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ public void ParseAllDirectories()
3636
throw new DsdlException($"Dsdl Path: {DsdlPath} could not be found!");
3737
}
3838

39-
// Parse each .uavcan file in the directory, including subdirectories
39+
// Parse each .uavcan or .dsdl file in the directory, including subdirectories
4040
// Converted to list to easily add the root namespace folder as well
4141
var dirs = Directory.GetDirectories(DsdlPath, "*", SearchOption.AllDirectories).ToList();
4242
dirs.Add(DsdlPath);
4343

4444
foreach (var file in dirs
4545
.SelectMany(Directory.GetFiles)
46-
.Where(fileName => fileName.Contains(".uavcan")))
46+
.Where(fileName => fileName.Contains(".uavcan") || fileName.Contains("dsdl")))
4747
{
4848
var (fullName, _, _) = FullTypenameVersionAndDtidFromFilename(file);
4949
if (!ParsedDsdlDict.ContainsKey(fullName))

0 commit comments

Comments
 (0)