From 2e5767c139ae608a71beae724bef7e97ea2f7a78 Mon Sep 17 00:00:00 2001 From: andrew Date: Mon, 18 Mar 2024 13:00:40 +0900 Subject: [PATCH 1/2] fix: generator outfile parsing on CLI resolves #320 --- .github/workflows/publish.yml | 16 ++++++++++++++++ Compiler/Options/GeneratorOption.cs | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d594f8fe..85aa571b 100644 --- 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 index 1a924b32..d1ecc661 100644 --- a/Compiler/Options/GeneratorOption.cs +++ b/Compiler/Options/GeneratorOption.cs @@ -37,7 +37,7 @@ public GeneratorOption() : base(name: CliStrings.GeneratorFlag, ["-g"]) /// A object if the token could be parsed; otherwise, null. 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 From 1dc3d9e5d62a7e9c4ccd8fb6630aca16a3aa93a5 Mon Sep 17 00:00:00 2001 From: andrew Date: Mon, 18 Mar 2024 13:01:17 +0900 Subject: [PATCH 2/2] chore: bump version --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 2ec2386b..9b37e0d0 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -VERSION="3.0.4" +VERSION="3.0.5" MAJOR=3 MINOR=0 -PATCH=4 +PATCH=5