Merge pull request #321 from betwixt-labs/dotnet-tools-fix

fix: generator outfile parsing on CLI
betwixt-labs · Mar 18, 2024 · 226423a · 226423a
2 parents 837ec19 + 1dc3d9e
commit 226423a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/.env b/.env
@@ -1,4 +1,4 @@
-VERSION="3.0.4"
+VERSION="3.0.5"
 MAJOR=3
 MINOR=0
-PATCH=4
+PATCH=5
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -248,6 +248,16 @@ jobs:
       - name: Download Compiler Artifacts
         uses: actions/download-artifact@v2
 
+      - name: List Chordc Artifacts
+        continue-on-error: true
+        run: |
+          ls ./chordc-osx-x64
+          ls ./chordc-osx-arm64
+          ls ./chordc-linux-x64
+          ls ./chordc-linux-arm64
+          ls ./chordc-win-x64
+          ls ./chordc-win-arm64
+
       - name: Extract Compiler Artifacts
         run: |
           mkdir -p ${{github.workspace}}/bin/compiler/Debug/artifacts
@@ -586,6 +596,7 @@ jobs:
 
 
       - name: Upload chordc for Windows x64
+        continue-on-error: true
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -596,6 +607,7 @@ jobs:
           asset_content_type: application/zip
 
       - name: Upload chordc for Windows ARM64
+        continue-on-error: true
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -606,6 +618,7 @@ jobs:
           asset_content_type: application/zip
 
       - name: Upload chordc for Mac x64
+        continue-on-error: true
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -616,6 +629,7 @@ jobs:
           asset_content_type: application/zip
 
       - name: Upload chordc for Mac ARM64
+        continue-on-error: true
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -626,6 +640,7 @@ jobs:
           asset_content_type: application/zip
 
       - name: Upload chordc for Linux x64
+        continue-on-error: true
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -636,6 +651,7 @@ jobs:
           asset_content_type: application/zip
 
       - name: Upload chordc for Linux ARM64
+        continue-on-error: true
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/Compiler/Options/GeneratorOption.cs b/Compiler/Options/GeneratorOption.cs
@@ -37,7 +37,7 @@ public GeneratorOption() : base(name: CliStrings.GeneratorFlag, ["-g"])
         /// <returns>A <see cref="GeneratorConfig"/> object if the token could be parsed; otherwise, null.</returns>
         private static GeneratorConfig? ParseGeneratorToken(string token, ArgumentResult result)
         {
-            var parts = token.Split(':');
+            var parts = token.Split(':', 2);
             if (parts.Length != 2)
             {
                 result.AddError($"Incomplete generator token specified '{token}'.");
@@ -47,6 +47,11 @@ public GeneratorOption() : base(name: CliStrings.GeneratorFlag, ["-g"])
             var generatorAlias = parts[0].Trim().ToLower();
             var remaining = parts[1].Split(',');
             var outputPath = remaining[0] ?? string.Empty;
+            if (string.IsNullOrWhiteSpace(outputPath))
+            {
+                result.AddError($"Output path not specified for generator '{generatorAlias}'.");
+                return null;
+            }
 
 
             // If the output path is 'stdout', no need to validate it as a file path