diff --git a/.github/actions/install-graphviz/action.yaml b/.github/actions/install-graphviz/action.yaml new file mode 100644 index 0000000..1f5371f --- /dev/null +++ b/.github/actions/install-graphviz/action.yaml @@ -0,0 +1,30 @@ +name: InstallGraphviz + +runs: + using: "composite" + steps: + - name: Install Graphviz on Windows + if: runner.os == 'Windows' + run: | + choco install graphviz -y + echo "C:\\Program Files\\Graphviz\\bin" >> "$GITHUB_PATH" + shell: bash + + - name: Install Graphviz on Linux + if: runner.os == 'Linux' + run: | + sudo apt-get install graphviz + echo "$HOME/.local/bin" >> $GITHUB_PATH + shell: bash + + - name: Install Graphviz on macOS + if: runner.os == 'macOS' + run: | + brew install graphviz + echo "$HOME/.local/bin" >> $GITHUB_PATH + shell: bash + + - name: SelfTest run dot + run: | + dot -V + shell: bash diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 3e2e893..5f524f9 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -25,6 +25,8 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ matrix.dotnet-version }} + - name: Install GraphViz ${{ matrix.dotnet-version }} + uses: ./.github/actions/install-graphviz - name: Restore dependencies run: dotnet restore - name: Test @@ -34,4 +36,4 @@ jobs: with: name: dotnet-results-${{ matrix.dotnet-version }}-${{ matrix.os }} path: TestResults-${{ matrix.dotnet-version }}-${{ matrix.os }} - if: ${{ always() }} \ No newline at end of file + if: ${{ always() }} diff --git a/ExtensibleParaser/ExtensibleParaser.csproj b/ExtensibleParaser/ExtensibleParaser.csproj index 098146f..f0c1f16 100644 --- a/ExtensibleParaser/ExtensibleParaser.csproj +++ b/ExtensibleParaser/ExtensibleParaser.csproj @@ -22,7 +22,4 @@ - - - diff --git a/Parsers/Dot/DotParser/DotParser.csproj b/Parsers/Dot/DotParser/DotParser.csproj index 385e11e..57a3383 100644 --- a/Parsers/Dot/DotParser/DotParser.csproj +++ b/Parsers/Dot/DotParser/DotParser.csproj @@ -18,9 +18,4 @@ - - - - - diff --git a/Regex/Regex/Dot.cs b/Regex/Regex/Dot.cs index 0ab7a8d..3cc21af 100644 --- a/Regex/Regex/Dot.cs +++ b/Regex/Regex/Dot.cs @@ -19,7 +19,7 @@ public static void GenerateSvg(string dotFilePath, string outputSvgPath) { var processStartInfo = new ProcessStartInfo { - FileName = "dot.exe", + FileName = "dot", Arguments = $"-Tsvg \"{dotFilePath}\" -o \"{outputSvgPath}\"", RedirectStandardOutput = true, RedirectStandardError = true, diff --git a/Regex/Regex/Regex.csproj b/Regex/Regex/Regex.csproj index 2be4451..83430c4 100644 --- a/Regex/Regex/Regex.csproj +++ b/Regex/Regex/Regex.csproj @@ -19,8 +19,4 @@ --> - - - - diff --git a/Tests/ParaserTests/ParaserTests.csproj b/Tests/ParaserTests/ParaserTests.csproj index 4b2d56b..a970dc8 100644 --- a/Tests/ParaserTests/ParaserTests.csproj +++ b/Tests/ParaserTests/ParaserTests.csproj @@ -32,8 +32,4 @@ - - - - diff --git a/Tests/RegexTests/RegexTests.cs b/Tests/RegexTests/RegexTests.cs index d507d9f..ef943cc 100644 --- a/Tests/RegexTests/RegexTests.cs +++ b/Tests/RegexTests/RegexTests.cs @@ -14,7 +14,7 @@ public void Setup() Trace.AutoFlush = true; } - [TestMethod, Ignore] + [TestMethod] public void DfaConstruction_3() { var pattern = @"(//[^\n]*(\n|$)|\s)*"; diff --git a/Tests/RegexTests/RegexTests.csproj b/Tests/RegexTests/RegexTests.csproj index c076953..4ee3950 100644 --- a/Tests/RegexTests/RegexTests.csproj +++ b/Tests/RegexTests/RegexTests.csproj @@ -19,8 +19,4 @@ - - - -