Merge pull request #2079 from kaby76/issue-2064

Changes for #2064.
antlr · Mar 15, 2021 · 090c0fb · 090c0fb
2 parents 78e083d + b4ea858
commit 090c0fb
Show file tree

Hide file tree

Showing 16 changed files with 5,688 additions and 525 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -30,12 +30,36 @@ jobs:
     - name: Test C# target
       run: |
         bash _scripts/regtest.sh CSharp
-  build-csharp-pwsh:
+  build-csharp-pwsh-problem-child:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest]
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Test C# target with PowerShell
+      shell: pwsh
+      run: |
+        if ("${{ github.event_name }}" -eq "pull_request") {
+            $Before = "${{ github.event.pull_request.base.sha }}"
+            $After = "${{ github.event.pull_request.head.sha }}"
+        }
+        else {
+            $Before = "${{ github.event.before }}"
+            $After = "${{ github.event.after }}"
+        }
+        dotnet tool install -g dotnet-antlr --version 3.0.6
+        _scripts/test.ps1 CSharp $Before $After
+  build-csharp-pwsh-ok:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, windows-latest]
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -52,4 +76,5 @@ jobs:
             $Before = "${{ github.event.before }}"
             $After = "${{ github.event.after }}"
         }
+        dotnet tool install -g dotnet-antlr --version 3.0.6
         _scripts/test.ps1 CSharp $Before $After
diff --git a/_scripts/regtest.sh b/_scripts/regtest.sh
@@ -26,9 +26,9 @@ fi
 case "$target" in
     CSharp)
         do_not_do_list=" \
-_grammar-test acme algol60 antlr/antlr2 apex apt \
+_grammar-test acme apex apt \
 arithmetic asm/masm asn/asn_3gpp atl \
-basic bcpl \
+basic \
 calculator capnproto cpp csharp cto \
 dcm dgol dice \
 erlang \
@@ -58,13 +58,11 @@ z \
 
     Java)
         do_not_do_list=" \
-        bcpl \
         "
         ;;
 
     JavaScript)
         do_not_do_list=" \
-        bcpl \
         "
         ;;
 
@@ -188,7 +186,7 @@ test()
 part1()
 {
 	dotnet tool uninstall -g dotnet-antlr
-	dotnet tool install -g dotnet-antlr --version 3.0.4
+	dotnet tool install -g dotnet-antlr --version 3.0.6
 	dotnet tool uninstall -g csxml2
 	dotnet tool install -g csxml2 --version 1.0.0
 	# 1) Generate driver source code from poms.

diff --git a/_scripts/test.ps1 b/_scripts/test.ps1
@@ -6,8 +6,8 @@ function Get-GrammarSkipList {
         "CSharp" {
             return @(
                 "_grammar-test",
-                "acme", "algol60", "antlr/antlr2", "apex", "apt", "arithmetic", "asm/masm", "asn/asn_3gpp", "atl",
-                "basic", "bcpl",
+                "acme", "apex", "apt", "arithmetic", "asm/masm", "asn/asn_3gpp", "atl",
+                "basic",
                 "calculator", "capnproto", "cpp", "csharp", "cto",
                 "dcm", "dgol", "dice",
                 "erlang",
@@ -34,10 +34,10 @@ function Get-GrammarSkipList {
                 "z")
         }
         "Java" {
-            return @("bcpl")
+            return @("")
         }
         "JavaScript" {
-            return @("bcpl")
+            return @("")
         }
         Default {
             Write-Error "Unknown target $Target"
@@ -108,9 +108,9 @@ function Test-GrammarTestCases {
     Write-Host "Test cases here: $TestDirectory"
     foreach ($item in Get-ChildItem $TestDirectory -Recurse) {
 
-    Write-Host "Test case: $item"
+	Write-Host "Test case: $item"
 
-        $case = Join-Path $TestDirectory $item
+        $case = $item
         $ext = $case.Extension
         if (($ext -eq ".errors") -or ($ext -eq ".tree")) {
             continue
@@ -266,6 +266,10 @@ function Test-AllGrammars {
 
     Write-Host "Grammars to be tested with $Target target:"
     Write-Host "$grammars"
+    # Try adding to path for Ubuntu.
+    Write-Host "PATH is $env:PATH"
+    $env:PATH += ":/home/runner/.dotnet/tools"
+    Write-Host "PATH after update is $env:PATH"
 
     $success = $true
     $t = Get-Date
@@ -295,8 +299,6 @@ function Test-AllGrammars {
 # the dotnet-antlr tool to instantiate drivers from templates.
 $Dir = Get-Location
 $templates = Join-Path $Dir "/_scripts/templates/"
-dotnet tool uninstall -g dotnet-antlr
-dotnet tool install -g dotnet-antlr --version 3.0.4
 
 $t = $args[0]
 $pc = $args[1]