From 192fb33534751a7bee4cb441807692cf88d15cad Mon Sep 17 00:00:00 2001 From: Balin Balinov Date: Wed, 5 Feb 2025 16:44:44 +0100 Subject: [PATCH 1/4] changed from '.uavcan' to '.dsdl' in DsdlParser --- RevolveUavcan/Dsdl/DsdlParser.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RevolveUavcan/Dsdl/DsdlParser.cs b/RevolveUavcan/Dsdl/DsdlParser.cs index afe1ef2..d51e0fa 100644 --- a/RevolveUavcan/Dsdl/DsdlParser.cs +++ b/RevolveUavcan/Dsdl/DsdlParser.cs @@ -36,14 +36,14 @@ public void ParseAllDirectories() throw new DsdlException($"Dsdl Path: {DsdlPath} could not be found!"); } - // Parse each .uavcan file in the directory, including subdirectories + // Parse each .dsdl file in the directory, including subdirectories // Converted to list to easily add the root namespace folder as well var dirs = Directory.GetDirectories(DsdlPath, "*", SearchOption.AllDirectories).ToList(); dirs.Add(DsdlPath); foreach (var file in dirs .SelectMany(Directory.GetFiles) - .Where(fileName => fileName.Contains(".uavcan"))) + .Where(fileName => fileName.Contains(".dsdl"))) { var (fullName, _, _) = FullTypenameVersionAndDtidFromFilename(file); if (!ParsedDsdlDict.ContainsKey(fullName)) From 5e95e73f1033e0135f64590163468b7c3c18f628 Mon Sep 17 00:00:00 2001 From: Balin Balinov Date: Thu, 6 Feb 2025 07:45:40 +0100 Subject: [PATCH 2/4] added or '.uavcan' for good measure --- RevolveUavcan/Dsdl/DsdlParser.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RevolveUavcan/Dsdl/DsdlParser.cs b/RevolveUavcan/Dsdl/DsdlParser.cs index d51e0fa..86a8b12 100644 --- a/RevolveUavcan/Dsdl/DsdlParser.cs +++ b/RevolveUavcan/Dsdl/DsdlParser.cs @@ -36,14 +36,14 @@ public void ParseAllDirectories() throw new DsdlException($"Dsdl Path: {DsdlPath} could not be found!"); } - // Parse each .dsdl file in the directory, including subdirectories + // Parse each .uavcan or .dsdl file in the directory, including subdirectories // Converted to list to easily add the root namespace folder as well var dirs = Directory.GetDirectories(DsdlPath, "*", SearchOption.AllDirectories).ToList(); dirs.Add(DsdlPath); foreach (var file in dirs .SelectMany(Directory.GetFiles) - .Where(fileName => fileName.Contains(".dsdl"))) + .Where(fileName => fileName.Contains(".uavcan") || fileName.Contains("dsdl"))) { var (fullName, _, _) = FullTypenameVersionAndDtidFromFilename(file); if (!ParsedDsdlDict.ContainsKey(fullName)) From 2a2f87faae2d5fe1f111526ff62e9baef003d80a Mon Sep 17 00:00:00 2001 From: Balin Balinov Date: Thu, 6 Feb 2025 07:59:20 +0100 Subject: [PATCH 3/4] Update build_and_test.yml updated from v2 -> v3: - uses: actions/checkout@v3 - uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3 --- .github/workflows/build_and_test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 9e74037..762a0a3 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup .NET uses: actions/setup-dotnet@v1 with: @@ -31,12 +31,12 @@ jobs: outputFormat: 'lcov' excludes: '[program]*,[test]test.*' - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: ${{ always() }} with: name: test_report path: /home/runner/work/RevolveUavcan/RevolveUavcan/RevolveUavcanTest/TestResults/test-results.trx - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: ${{ always() }} with: name: coverage_report @@ -51,4 +51,4 @@ jobs: with: name: Test Report # Name of the check run which will be created path: /home/runner/work/RevolveUavcan/RevolveUavcan/RevolveUavcanTest/TestResults/test-results.trx # Path to test results - reporter: dotnet-trx # Format of test results \ No newline at end of file + reporter: dotnet-trx # Format of test results From d3a743631b168748e127afccb8e7f49a25523833 Mon Sep 17 00:00:00 2001 From: Balin Balinov Date: Thu, 6 Feb 2025 08:02:27 +0100 Subject: [PATCH 4/4] Update build_and_test.yml Turns out v3 is also depreciated https://github.blog/changelog/2024-04-16-deprecation-notice-v3-of-the-artifact-actions/ Trying v4 here. --- .github/workflows/build_and_test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 762a0a3..047bb07 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup .NET uses: actions/setup-dotnet@v1 with: @@ -31,12 +31,12 @@ jobs: outputFormat: 'lcov' excludes: '[program]*,[test]test.*' - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: ${{ always() }} with: name: test_report path: /home/runner/work/RevolveUavcan/RevolveUavcan/RevolveUavcanTest/TestResults/test-results.trx - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: ${{ always() }} with: name: coverage_report